Mostly working. Ready to add the bootstrap now