tonights work - progress!