Updated Object Oriented stuff

Made more classes