Added some data structures, and organized some data into objects. Implemented considerable better way of handling vocabulary and locations.