Tweaking a bit for the CS 
It be a bit rough currently but almost there :) 
And then the picture hunt begins