Add cucumber, organize stuff