Added NA_ASSERTs

Working on the assert additions