- WIP: @ANurses' first commit, manually patched in.