All sorts of crap added. I should probably commit more often.