WIP -- trying to hack in the changes, still not sure where to put them!