Added better framework for entities and some wave spawns