modified both files. I'm running into "function object is not iterable" issues that i need to work out.