Down to 13ish fails.
Continued work on #110