Add error checking, setup new global constants