break into files, merge in Theodores jprint work