Created basic interface for client
fixed confilcts
fixed confilcts