finished rough pass of step two
Merge branch 'master' of https://github.com/matt-casey/civic-panda