Now with buttons.  Also, eclipse is freaking out.  This warrants a
restart.