updates, begin putting together error-handling mechanism