Added basic client, some changes in core.