Add error handling, domains