servlet overhaul, mainly wip