Cleaning up some of the interactions and making the classes a little more single purpose.