Stick to basic client for now