First working version
small cleanup
bootstrap stuff