Another code drop of older framework code from 2000-2006