Input

Code Review: input
Contains integration branch as of 4/29 11:25am