added color change and popup
final demo commit