Dustin and I got together and did a large merge with the master code branch. There were 35 files, some of which had some major changes. We originally only had about an hour scheduled. It took 2.5 hours to finish everything up. Pretty big. Light training along the way.