Massive WIP commit, again.