Initial commit
Cleanups
wip