Code for my upcoming refactor