More work towards getting the appservers combined