Moving this lib inside of options framework, and loading from init...