Updated classing, made sub-lists correctly, added a second job