Initial refactors for epic mode