Laid out better, but need to get input stream to function