Looking good there!
Yeah I am going to work on it tonight but will test the NB first as you mentioned.