Adding code - phase 1