Incremental progress

Complete to SUN/86