make it more testable
go full bootstrap
fix build