Marking a todo for the fix I have in mind (due to traveling, want to log idea). Only 2 unit tests to fix now.