Refactored, bug resolution and re-exported.

## Ready State: No