commit before breaking code up and encapsulating