work...added pet peeve spaces cuz it kept yelling
stuff..a couple fixes and stuff
Merge branch 'api_v2' of https://github.com/joebeone/cascade into api_v2