Broke Input class down further