Input v2.0

Can we merge this into the master branch? Input v2.0 is now ready and implemented.