Rework Mains so they are basically as identical as possible.

Rework Mains so they are basically as identical as possible. #150