- minor refacotring
- minor refactoring - TODO: panel & cnc should really use unique keys. maybe add config file?