Significant update still working on package design

Many changes, should be taking shape soon