refactoring, implement retry, better error handling
0.1.0