Input function partially fixed. Working on output testing...
Drew's work from the weekend