Intermediate commit. Yet to complete model<->map linking.