Patch!

Another step closer. Untested.