Worked on the back bone of the Object Orientated-ness, that we will hopefully implement.