98% complete: minor bug to fix