Tracking down bugs, nothing fixed yet
trying to fixup bad commits