Dev/refactor

alllllll of the tables partialed out
sort of a disappointing net loss of lines, but oh well