Added and fleshed out domain objects.