@raise-standards: To do list 30