giant horrible commit that passes current tests but has funcs that will break