Slowly organizing things. Slowly getting rid of STL dependence.