WIP - removing methods from domain class, adding them to service, simplifying so we can persist rows, actions etc.