Finished conversion to Pundit