work done on adding handling for case statements