Committing because all errors appear to be resolved at the moment.