refactored and added tuples
got non-nested tuples working