Add error checks. Remove callbacks.