Last commit before merging redesign into master.