Deuce
Refactor calabash features