Start of new feature development - 0.6.0.0