more progress woohoo