Started working on new options that make more sense