yet another late night (early morning?) code dump...