Cleanup, Major changes but shouldnt break anything

but this is experimental needs testing!!!!!