Gpii 947

http://issues.gpii.net/browse/GPII-947
Not sure why there are variable hanging around her. They should be scoped properly to a function and passed around as needed.