Finish implement logic, continue bootstrap