Move the temporary error to get ready to get rid of it altogether
Flesh out the structure support a bit more