redo some stuff

rework some code some code so things ish load.