Removed comments and changed back to original functionality. This branch is now just a refactor