Way too much shit to fit here

Extended BL, refactored static data methods to factories, more
templates, ...