khloud finished s12: functional but not done

@KareemAliRahman