sigh, will need to tinker some more tomorrow...