Tests passing. Different implentation

- Needs to rebased to back out reverted changes
- Needs documentation update
- Needs lazyHandlerregistry update