wtf... readding these lost commits @brianr