Fixing your broken merge request. :P

Right, you had some things referenced incorrectly... This seems to work now. Please let me know if you see anything odd.