Modularize some classes
Simplify class.
Refactor methods.
Refactor to a single method for now.