Commit before some drastic changes