Add bootstrap

Trying to merge to one codebase to start off with