Tests pass
Tests pass
Tests pass
Tests pass
Fixed more stuff