Massive commit, really! Tons of new stuff and a lot of changes.