first round of changes

a work in progress