ready to deploy to jitsu
Refactored for use lib