lots of changes to SecondaryJobHandler, started implementing
MartinJobService