Issue #2
- Added some skeleton for error checking