Input class working
merged Ben Code with Scott Input Code