Nawqaan 303

Initial commit for NAWQAAN-303
Please review.