Commit recent work 00 - 07