Cleanup consts, add in a few as well.
Onward with the wrappage
Cleanup & start being smarter