This feature is mostly dependent on #21
This feature is mostly dependent on #21