pushing my changes (still in progress) to merge with eric