workign on jobs index
fixed merge conflicts