Updated architecture/Implemented basic client