This patch actually breaks a bunch of things, but I just want to be done with the deck changes for now. I'll go back and fix things before releasing! Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>