Change some bits to ORM
Merge pull request #2 from ShaneDrury/master

Clean up some bits