Work in progress. Cleaned up MainExecuter.