Still refactoring
Small steps