Add 'Make an offer'
Replace outside API w/ server API
Fix merge conflict Pt 1
Fix merge conflict Pt 2