Adding todos and notes to the code

discovered some new unsupported scenarios so leaving notes where the code needs to be touched.