Almost Final

Bugs in the commenting part. Everything else is ready. We showed it to
the professor and he says its perfect. We can add any other functions
if needed