Restricting job/ url patter for Admins only
Code cleanup
Error catching work (in progress)