Code and domain model
Merge pull request #6 from swn881/sogg485

Code and domain model