More editing, but cucumber not working y et.