starting some work on refactoring inputs