birdman submit

merged oscar and adirans code