Move towards the finalized refactor