The Commit

Refactor, recursive singleton fix