Buttons

Began tackling the many buttons problem