Use new AddTS to specify timestamp
Refactor out enable routines
Revert init double prevention

It prevents closures from working correctly.
Return errors from collection funcs