Initial work on main window and some reworking of Service classes.