Intermediate commit before some huge changes.