Add (partially implemented) new encoding system