clean up ifs
Start renamed to Begin
Add modal message