Cleaned up the code, refactored

Also preparing for more functionality
Added TODO mode
Added update mode + some cleanup

No more editing the json file