FS-1 FS-2 Manual merge - Added protocol to handle connections, create a user and
authenticate a user