Closed trdavidt closed 1 year ago
Closes #582
Please ignore the commits before the most recent one, I accidentally included those from another branch
Closes #582