Add cukes
Refactor this so it's includable in cucumber