WIP: almost works

Problems remaining: no injection of SerlvetContext