Implemented Stuff

did all the things i was told to.