cleanups
Considering new architecture
wip commit