Did some cleanup, it’s not the best setup but in proud of it