Here we go in a BDD stylie
Fixed some small issues
Starting to re-create