Uncommitted Changes

Changes that didn't get sync'd for Friday's turn in.