Cleaned up some code... still lots more todo.
Added NSRL creation
Fixed prev commit