Moved around my code so it's in a better setup