Fix some merge errors
Make some tests pass. This really sucks as DOGE lacks so much needed documentation right now...