Added user input selectors

Missing calculations