More progress...

Almost there... although I was a bit distracted by a 3 hours surf session last evening :)