a bunch more progress