WIP commit before cleanup
WIP commit before cleanup
ok. finally ready to diverge