fixed tests again
moving to promises. added energy points