moving stuff around

setting up for possible fixes, still working on it.