Push more into the lib helpers
Push more into the lib helpers
Pushed to helper class to eliminate some duplication