Minor syntax changes to get to compile.  Still untested (I'm hungry)