Refactors and work to support aurora