Refactoring in progress - ButtonInterface.java
Update on what I have