Lots of progress! Lots not working, but will fix during class