Ability to disable pre-loading
Mark reports complete on saving