Work on progress w/ entity