Feature1 branch and a small change

Added to the new branch. This will be for:
 * One
 * Two
 * Three