partial checkin re #4 - adding buttons