Good first pass but need to do checks for Entity here.