Added buttons -- is this what we are going for?