Changed some things

Added in tests, hammered out some more stuff for storing entity data.