temp
Adds error catching.