Third Commit

Finished the class and added some more things.