making some progress finally