More changes for the MrsPath branch. Still not completely working.