Adding things and half way through refactoring