basic client system
added ws handler
merge