almost done. forgot to commit earlier
all tests are green. yay.