add add_context
move to /server
add client