Models/relations implemented, 1 bug persists