Began compartmentalizing and rewriting header