master: Adding some changes to implement a swing interface