Make a lot of syntactical changes, packing display functions as properties of the Objects they display
More function packing complete
Move JSON objects into a separate js file