Partial GM support

Seems like too much of a hassle to do, but I'd like to keep it around
just in case I change my mind in the future.