-Add some comments and such