Merge "Revert "Split up main engine from methods""