Refactor singular resource for speed

~20% improvement on test speed if we avoid updating
new records.
Add control tracking