some heading stuff
resolved freaking conflicts
added the names again because Jeremy deleted it