Cleaned up code

removed irrelevant code, cleaned up comments, made sure new JSON object
calls work. This is a fully deployable app.