Initial Courierdrone patch, work in progress