work in progress, bid system updates
Merge remote-tracking branch 'origin/master'