Encoder working, fixup working
Ok, now everything appears to be working
Output added to repo