Uncommited stuff from obsolete workstation.