Now doing the same for Input...
Input moved over. Cleaner diffs...?