Big big commit

tons o stuff
oh boyyyy