Add server request decorator
Complete rewrite of server...