Updates from the calls

This has most the updates from the call, still more coming, but opening the PR now so we can all get on the same page.
Does ruby have a switch statement or the ability to do an if/else?  I don't think we want to keep executing the "if" once we find a match.