Fixing the domain model, adding new Acceptance stuff