Rectifying a fubar commit that included my build folders. Also did some
work on dynamic change of the code in NBVM.
Note to self: learn how to use git...