Initial structure ok and basic queries implemented