Updated to start adding support for more options.