added Minimalistic entities; NOT COMPILING YET