WIP: refactor and implement remote controll