Input v2.0

See Included Documentation for new Features