Errors are being handled for dev needs
This closes #8