changed server, moved stuff

changed server to hkhamm.com
reorganized the controller
collected TODOs at the top in controller