Yes, I am working on cleaning this up and trying to figure the best way to pass these options around.