progress with raw calcs