committing the code to the slick2 branch