Coming along but still lots of detail work left to do now -