merged bird stuff manually

cause git blows right now