Implementing tuples

To prevent code injection (despite variables are sanitized) I'm implementing tuples -- still missing the commits here