Fifth Push

Cleaned up headers