Main Stream added

Resolved merge conflicts and added `Main`