Merge in stuff

A lot of the duck physics stuff should probably be moved into separate functions, but I just wanted to push this out quickly during my lunch break.