Added some more todos and concept scratches.