filling out domain class
Resolving merge