Mostly finished basic datamodel