First major edit

This should get the base working.  This expands it beyond empty buttons.