Co-authored-by: Tom Moor <tom.moor@gmail.com>
* Ongoing * refactor * test * Add cleanup task * refactor