5 parsing together now need to clean up code and compare enum type instead of string