basic header begun
fixes merge conflict