50% of issue complete

Working towards finishing ukodi-training/ODP-Group3#1