sort of finished lol
kathy's changes