made some progress on this :-D