start working on recalc new position
reformat/clean up files