Started work on NEI Integration