WIP: Topic/path

Ingore this, just for review :car: 
Remove