More ORM

ORM ME BRO
ORM HAPPINESS

ALMOST THERE. MAYBe. PROBABLY NOT.
Merge branch 'master' of https://github.com/BlindspotX2/COMP426