still working away on this but much closer to a realease now