Aidan's branch

This is the manual merge of gabeStable and Aidan's-Branch. This shall be the new master and develop.