Refactored some methods + implemented Make Offer

Signed-off-by: Mihaela Martinas <martinas.mihaela21@gmail.com>