Working draft

Signed-off-by: Mior Muhammad Zaki <mior.muhammad@iproperty.com>