Fix up Model and start to implement queries.