Sneak in one more commit before Rainbow breaks everything <3