Extraction better. Now need to figure out passing of variables.

Need to figure out passing variables around as options in JS the best
way.