some progress hopefully