still not there yet but making some progress