Ma small refactor

WIP: thinking about how to break up this class. 
Started with breaking large methods down into smaller methods.