Rebuilt completely

No longer relying on bootstrap