Created branch for 0.6 development & experiments - Commits may not compile