Initial step partial
Fix depth pruning error
Run flow ok
Merge branch 'jhow-dev' into Johnny

Conflicts:
	function.cpp
Merge Final Patch