replace direct Entity and Account access with new Identity

Still a little messy, should investigate .mapResult/Query/Shape for a better
way to do this.