WIP  - some TODOS