Moved engine code into Polar and reduced Main