add encoders; remove tuple functions