Changes required for Inversions and Base Atom types. This will break OOPSE badly for a few days or so...