close #125, more work will be needed to *really* close this one though