grand redesign in preparation to http support.