Start of new feature development - 0.7.0.0