Interim commit to cover InputStream work (not complete)