follows a wishlist with improvements to the code to be outsourced, for example see helpdesk ticket NFL-37244-952
