more progress on stuff