Working on refactoring and getting familiar with interface editor. Past due I make a commit.