Time for bed. Too many changes for accurate commit messages. Also tired.