WIP for a proper working base
Cleanup for a fresh start