Refactor for addition of Entity
post fubar comit
remove Core.chain and various other stuff