more interaction system decoupling - WIP