Add Template Haskell to dependencies
Change syntax from tuples to curried