Major refactor for performance.
Bump Version