Update master to templated methodology, and get to work on the OO part