Begins adding error catching