This can be done as part of #24
This can be done as part of #24