Merged in my stuff from nsdev2