FInished primary packend work: tests passing