Starting to lay out a series of TODOs to plan out where I'll need to modify implementation.