Removed some unneccesary functionality, added comments@