Add error handling
Add proof of concept implementation