idk
merge
more tweaking.  memory errors are the worst