Start of new feature development - 0.9.0.0