Refactor code to be in functions
We now have a vendored copy of roundup
norman is now a 404