wip: scenes re-work