Needs a bit less refactor now