Tidied up the auth wrappers, begin work on pagination