In the middle of a refactor
Not working properly