WIP: Working through broken references to new models