Merged cucumber files

Andrew what the h*** is "clack"