classmap stuff
blaMerge branch 'master' of github.com:agnesvanbelle/TL