Fleshed out the data model some more. Might be ready to start building
the Activites.