WIP: Separate domain models from forms