Trash and moveton - ORM should be fully refactored