cleaning up stuff that i broke
made entity class, removed a small bit of coupling