Make setup properties dynamic
Add in error handling functionality