Updating to only extend locals

Removing pieces that extend all the options.
0.1.5