finally made some progress