Wacky 02

added several more user inputs