Shane: re-worked the listBucket methods