Another commit. Lots o' changes.