Re-added input.  Isn't working 100% correctly.