Closes #294
Closes #295
Tidied up method order