going for a single package implementation
Tests passing. no more package junk