Final submissions, etc.

Cleaned up and organized a bit, simpler loading functionality,
submissions json file is complete.