Formatted code.
Added DocBlock comments to model for better doucmentation.
Resolve conflicts. Derp, my bad. It's still early :(