Major Code ReWrite

Change alot of the ways things where done, still a WIP