done. oops. should've made more commits