Continue refactroing lol