Added lots of stuff including a BaseNValue