more work
progres here, too