BenTsDerp
Manually merged stuff