good pass at standard, legacy needs testing