Adding base of arguments and options
Expanding on input classes and tests