Still testing parts of this nag code - issues