Handled new user input parameters. Removed options parameter when executing functions. Some spaghetti in here.