Make Stuff more Objected Oriented for my own sake.