Rolling in new system changes

Also adding in comments