Davids feature 2 - 

Ready from my perspective. Can you make the additions and merge to master?