More working in of old stuff