Changed almost everything

Change the way most things work it was to messy.