Don't bail on errors yet, can fix later