Marked as a "Draft" simply because this depends on !414.
Fixes #624 for the foreseeable future and most reasonable purposes.