Adding in tuples. Close #30. Ugly as hell.