yay more progress