quick refactor to separate activity creation from the other stuff
Merge pull request #14 from thatandyrose/refactor-models

quick refactor to separate activity creation from the other stuff