Updates to ORM to make use of properties rather then large array.

HAS NOT BEEN TESTED!