Total re-work..not much more can be done until more server handlers are added...