too many things at once, was looking at issue #26 but failed to revert that part.