Intermediate commit. Doesn't work. Made a LOT of changes, and it's time to commit.