I know I left a TODO in here, just wanted to get initial temperature on this large chunk of work prior to going down that route since it takes more effort