made progress yay