Modified streams. Added parser. Modified tests.