Knocking out some technical debt today... IYKYK