* error handling
Add test stuff