Restricting auto-populate to new companies; updating todo