Redoing a lot: versions instead of version, prep for database inclusion, fixed 'already installed'