wip splitting up the package into 3