A great feature branch

Here is a list of changes.