First commit. OO starting to be implemented