Updated to reflect major changes made while working on PBDB Navigator