model and controllers pretty much there
Merge pull request #1 from dashinfall3/model

model and controllers pretty much there