* Fixing singletons
* Implementing log in wp-veneer, instead of cluster