Big commit before other modifications.