todo task for gci and bug fix

Won't work because document isn't added as a component yet.