rewriting the cases for app... it may need more, but heidi was on the right trail so i went wit that