Add server.r before branching
Cleanup. Server now in devel branch