Reworked entire database, updated to latest NOMP config settings, and new features