Add logging

Change client to simple singleton