finished models basically
Merge pull request #4 from MrBean83/models

finished models basically