TEST
Cleaned up code and added comments
Slightly changed code to be able to commit changes to the master branch because merge isnt working right