Addition of some class files, and update to GUI