Break out domain objs into package. Create companion object
change class param to Int