Added two classes and then several methods to those branches. Still have lots of work to do