#170 Package job - wip