WIP - Upgrade to Slick 2 - suite -