first working version since merge issues; had to back out isat chart but isat data is in tact