Redo upcoming web interface stuff