Icky couchy server

This is a pull request as it's the easiest way to show the two commits here. The work here is for testing and review purposes only.