First commit
Refactor of ORM operations
Cleanup, fixes to column filters and error handling