WIP: improving bootstrap flow

-server seems to be working fine
-tests are still WIP