Backup commit. Added some work at the end.