finish implementation of model/packages