* Fleshed out model mappings * Mapped some entity logic * Fixed a few of the issues. * Fixed a typo of sorts * Fixed the rest of the suggestions.