Recursive stuff

Merging recursive stuff to development branch