Fix main class

Begin design of stream