Move some things into functions, possibly for testing later?
Merge branch 'master' of https://github.com/ImJasonH/googlecl