Pull request to merge feature 8, 9, and 10 into development.