Rearranging some things. Intermediate commit.