Grammar changes made, need to redo idup strategy
Just doing string dupes manually now for header code, this may cause double dups
Added some unit tests
Remove testing stuff