begin refactor for 1.2 version - including utils for older files