Added domain model suggested by Ash

Indeed...shouldn't really work like this but it's in a funny state. Working on sidebar now