1d still not working for error cases
1e half writte, not sure what we're comparing correct to
Merge remote-tracking branch 'origin/master'