Experimenting with swap

Check how this works out on an actual server, merge if it seems ok.