Continued working on SolidEntityController