Last commit before code rework.