Didn't commit last night, hopefully these are awesome changes