Initial Push
Cleanup of bootstrap