Added GivenWhenThen Todo's; also added TODO's in, and modified config.xml