Last big commit for quite some time.