Make routines before we make tables
Merge pull request #285 from iarna/make-routines-first

Make routines before we make tables