Missed this commit last night

Quickly commiting this stuff and pushing it, work was pretty much done
last night, just never made the commit. Someone needs this now.