Merge pull request #1 from dashinfall3/model

model and controllers pretty much there
parser
Merge pull request #2 from dashinfall3/parse

parser
debugging the crap out of this thing