Add relationships b/t models, fix api controllers