First working implementation of os-client + various updates