Started making the refactors