cleanup
accept interface not implemtning class
added entity loading; extended entity class