Adds additional error handling
Adds additional test to the unit test
Adds a feature list