Lookup changes (still broken)
Merge branch 'master' of github.com:dougmackenzie/portal