working on headers for vc2
sorting tags
Final commit for delivery