First pass at upgrading status.