[TASK] Finish key-management
[TASK] Almost done
[TASK] A bit more checking..