Save some stuff before switch branch

Sorry for so many commits...