Have the refactorings done, just need to do the extension of the additional feature