Update:
  Started work on commenting code