Add bootstrap
Fix borked bits