Added more step definitions and killing the old branches because they suck.