Add very dirty and buggy implementation for client