made new version of everything, almost makes complete block