added popup
Merge https://github.com/fernandezmatt/CS147