long overdue commit, does tons of crap