Flesh out new output options