Fix a few notes
Fix a few notes

Move an import and re-add a TODO note.

rosshendrickson-wf/furious,Workiva/furious,Workiva/furious,mattsanders-wf/furious,beaulyddon-wf/furious,andreleblanc-wf/furious,beaulyddon-wf/furious,andreleblanc-wf/furious,rosshendrickson-wf/furious,mattsanders-wf/furious