rework of activity system, bit wonky for level layer