Ddddddddd ....

Closes #128, closes #129 and closes #130.