Starting to split the requirement of passing the entity to the repo
definition
Not super happy with this, but I'm just committing it so that I can work
on it more later. Might end up throwing out this branch entirely