entities / no collison yet / next push
part2 of last commit