Add TODO with some concepts that need to be addressed in short order