From 7e35da05c2d3f285c07876c14c8b380dd8da2803 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Wed, 10 Jan 2018 22:04:03 -0500
Subject: [PATCH 01/13] Added a whole bunch of shit. Also added error handling
 in creation.

---
 cards/autocomplete.py |   4 +
 cards/collector.py    | 216 ++++++++++++++++++++++++++++++++++++++++++
 cards/id.py           | 214 +++++++++++++++++++++++++++++++++++++++++
 cards/mtgo.py         | 214 +++++++++++++++++++++++++++++++++++++++++
 cards/multiverse.py   | 214 +++++++++++++++++++++++++++++++++++++++++
 cards/named.py        |  19 +++-
 cards/randomcard.py   | 212 +++++++++++++++++++++++++++++++++++++++++
 7 files changed, 1092 insertions(+), 1 deletion(-)
 create mode 100644 cards/collector.py
 create mode 100644 cards/id.py
 create mode 100644 cards/mtgo.py
 create mode 100644 cards/multiverse.py
 create mode 100644 cards/randomcard.py

diff --git a/cards/autocomplete.py b/cards/autocomplete.py
index 18346d1..0e705ec 100644
--- a/cards/autocomplete.py
+++ b/cards/autocomplete.py
@@ -30,6 +30,10 @@ class Autocomplete(object):
 			url='https://api.scryfall.com/cards/autocomplete?',
 			params={'q':self.query, 'pretty':self.pretty, 'format':self.format}))
 
+		if self.scryfallJson['object'] == 'error':
+			raise Exception(self.scryfallJson['details'])
+			self.session.close()
+
 		self.session.close()
 
 	def object(self):
diff --git a/cards/collector.py b/cards/collector.py
new file mode 100644
index 0000000..b51cef3
--- /dev/null
+++ b/cards/collector.py
@@ -0,0 +1,216 @@
+import asyncio, aiohttp
+import json
+
+class Collector(object):
+	""" cards/named
+
+	Parameters:
+		code: int				The 3 or 4 letter set code.
+		collector_number: int	The collector number of the card.
+		format: str				The data format to return: json, text, or image. Defaults to json.
+		face: str				If using the image format and this parameter has the value back,
+									the back face of the card will be returned.
+									Will return a 404 if this card has no back face.
+		version: str			The image version to return when using the image
+									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
+		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+
+	Attributes:
+		object: str				Returns the type of object it is. (card, error, etc)
+		id: str					The scryfall id of the card.
+		multiverse_ids: arr		The associated multiverse ids of the card.
+		mtgo_id: int			The Magic Online id of the card.
+		mtgo_foil_id: int		The Magic Online foil id of the card.
+		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
+		uri: str				The Scryfall API uri for the card.
+		scryfall_uri: str		The full Scryfall page of the card.
+		layout: str				The image layout of the card. (normal, transform, etc)
+		highres_image: bool		Returns True if the card has a high res image.
+		card.image_uris: dict	All image uris of the card in various qualities.
+		cmc: float				A float of the converted mana cost of the card.
+		type_line: str			The full type line of the card.
+		oracle_text: str		The official oracle text of a card.
+		mana_cost: str			The full mana cost using shorthanded mana symbols.
+		colors: arr				An array of strings with all colors found in the mana cost.
+		color_identity: arr		An array of strings with all colors found in on the card itself.
+		legalities: dict		A dictionary of all formats and their legality.
+		reserved: bool			Returns True if the card is on the reserved list.
+		reprint: bool			Returns True if the card has been reprinted before.
+		set: str				The 3 letter code for the set of the card.
+		set_name: str			The full name for the set of the card.
+		set_uri: str			The API uri for the full set list of the card.
+		set_search_uri: str		Same output as set_uri.
+		scryfall_set_uri: str	The full link to the set on Scryfall.
+		rulings_uri: str		The API uri for the rulings of the card.
+		prints_search_uri: str	TODO: Figure out what this does.
+		collector_number: str	The collector number of the card.
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
+	"""
+
+	def __init__(self, code, collector_number, _format=None, face=None, version=None, pretty=None):
+		self.code = code
+		self.collector_number = collector_number
+		self.format = _format
+		self.face = face
+		self.version = version
+		self.pretty = pretty
+		loop = asyncio.get_event_loop()
+		self.session = aiohttp.ClientSession(loop=loop)
+
+		async def getRequest(url, **kwargs):
+			async with self.session.get(url, **kwargs) as response:
+				return await response.json()
+
+		self.scryfallJson = loop.run_until_complete(getRequest(
+			url='https://api.scryfall.com/cards/{}/{}'.format(self.code, self.collector_number),
+			params={
+				'format':self.format,
+				'face':self.face,
+				'version':self.version,
+				'pretty':self.pretty
+			}))
+			
+		if self.scryfallJson['object'] == 'error':
+			raise Exception(self.scryfallJson['details'])
+			self.session.close()
+
+		self.session.close()
+
+	def object(self):
+		return self.scryfallJson['object']
+
+	def id(self):
+		return self.scryfallJson['id']
+
+	def multiverse_ids(self):
+		return self.scryfallJson['multiverse_ids']
+
+	def mtgo_id(self):
+		return self.scryfallJson['mtgo_id']
+
+	def mtgo_foil_id(self):
+		return self.scryfallJson['mtgo_foil_id']
+
+	def name(self):
+		return self.scryfallJson['name']
+
+	def uri(self):
+		return self.scryfallJson['uri']
+
+	def scryfall_uri(self):
+		return self.scryfallJson['scryfall_uri']
+
+	def layout(self):
+		return self.scryfallJson['layout']
+
+	def highres_image(self):
+		return self.scryfallJson['highres_image']
+
+	def image_uris(self):
+		return self.scryfallJson['image_uris']
+
+	def cmc(self):
+		return self.scryfallJson['cmc']
+
+	def type_line(self):
+		return self.scryfallJson['type_line']
+
+	def oracle_text(self):
+		return self.scryfallJson['oracle_text']
+
+	def mana_cost(self):
+		return self.scryfallJson['mana_cost']
+
+	def colors(self):
+		return self.scryfallJson['colors']
+
+	def color_identity(self):
+		return self.scryfallJson['color_identity']
+
+	def legalities(self):
+		return self.scryfallJson['legalities']
+
+	def reserved(self):
+		return self.scryfallJson['reserved']
+
+	def reprint(self):
+		return self.scryfallJson['reprint']
+
+	def set(self):
+		return self.scryfallJson['set']
+
+	def set_name(self):
+		return self.scryfallJson['set_name']
+
+	def set_uri(self):
+		return self.scryfallJson['set_uri']
+
+	def set_search_uri(self):
+		return self.scryfallJson['set_search_uri']
+
+	def scryfall_set_uri(self):
+		return self.scryfallJson['scryfall_set_uri']
+
+	def rulings_uri(self):
+		return self.scryfallJson['rulings_uri']
+
+	def prints_search_uri(self):
+		return self.scryfallJson['prints_search_uri']
+
+	def collector_number(self):
+		return self.scryfallJson['collector_number']
+
+	def digital(self):
+		return self.scryfallJson['digital']
+
+	def rarity(self):
+		return self.scryfallJson['rarity']
+
+	def illustration_id(self):
+		return self.scryfallJson['illustration_id']
+
+	def artist(self):
+		return self.scryfallJson['artist']
+
+	def frame(self):
+		return self.scryfallJson['frame']
+
+	def full_art(self):
+		return self.scryfallJson['full_art']
+
+	def border_color(self):
+		return self.scryfallJson['border_color']
+
+	def timeshifted(self):
+		return self.scryfallJson['timeshifted']
+
+	def colorshifted(self):
+		return self.scryfallJson['colorshifted']
+
+	def futureshifted(self):
+		return self.scryfallJson['futureshifted']
+
+	def edhrec_rank(self):
+		return self.scryfallJson['edhrec_rank']
+
+	def tix(self):
+		return self.scryfallJson['tix']
+
+	def related_uris(self):
+		return self.scryfallJson['related_uris']
+
+	def purchase_uris(self):
+		return self.scryfallJson['purchase_uris']
diff --git a/cards/id.py b/cards/id.py
new file mode 100644
index 0000000..18b7b69
--- /dev/null
+++ b/cards/id.py
@@ -0,0 +1,214 @@
+import asyncio, aiohttp
+import json
+
+class Id(object):
+	""" cards/named
+
+	Parameters:
+		id: str					The Scryfall id of the card.
+		format: str				The data format to return: json, text, or image. Defaults to json.
+		face: str				If using the image format and this parameter has the value back,
+									the back face of the card will be returned.
+									Will return a 404 if this card has no back face.
+		version: str			The image version to return when using the image
+									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
+		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+
+	Attributes:
+		object: str				Returns the type of object it is. (card, error, etc)
+		id: str					The scryfall id of the card.
+		multiverse_ids: arr		The associated multiverse ids of the card.
+		mtgo_id: int			The Magic Online id of the card.
+		mtgo_foil_id: int		The Magic Online foil id of the card.
+		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
+		uri: str				The Scryfall API uri for the card.
+		scryfall_uri: str		The full Scryfall page of the card.
+		layout: str				The image layout of the card. (normal, transform, etc)
+		highres_image: bool		Returns True if the card has a high res image.
+		card.image_uris: dict	All image uris of the card in various qualities.
+		cmc: float				A float of the converted mana cost of the card.
+		type_line: str			The full type line of the card.
+		oracle_text: str		The official oracle text of a card.
+		mana_cost: str			The full mana cost using shorthanded mana symbols.
+		colors: arr				An array of strings with all colors found in the mana cost.
+		color_identity: arr		An array of strings with all colors found in on the card itself.
+		legalities: dict		A dictionary of all formats and their legality.
+		reserved: bool			Returns True if the card is on the reserved list.
+		reprint: bool			Returns True if the card has been reprinted before.
+		set: str				The 3 letter code for the set of the card.
+		set_name: str			The full name for the set of the card.
+		set_uri: str			The API uri for the full set list of the card.
+		set_search_uri: str		Same output as set_uri.
+		scryfall_set_uri: str	The full link to the set on Scryfall.
+		rulings_uri: str		The API uri for the rulings of the card.
+		prints_search_uri: str	TODO: Figure out what this does.
+		collector_number: str	The collector number of the card.
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
+	"""
+
+	def __init__(self, _id, _format=None, face=None, version=None, pretty=None):
+		self.id = _id
+		self.format = _format
+		self.face = face
+		self.version = version
+		self.pretty = pretty
+		loop = asyncio.get_event_loop()
+		self.session = aiohttp.ClientSession(loop=loop)
+
+		async def getRequest(url, **kwargs):
+			async with self.session.get(url, **kwargs) as response:
+				return await response.json()
+
+		self.scryfallJson = loop.run_until_complete(getRequest(
+			url='https://api.scryfall.com/cards/{}'.format(self.id),
+			params={
+				'format':self.format,
+				'face':self.face,
+				'version':self.version,
+				'pretty':self.pretty
+			}))
+
+		if self.scryfallJson['object'] == 'error':
+			raise Exception(self.scryfallJson['details'])
+			self.session.close()
+
+		self.session.close()
+
+	def object(self):
+		return self.scryfallJson['object']
+
+	def id(self):
+		return self.scryfallJson['id']
+
+	def multiverse_ids(self):
+		return self.scryfallJson['multiverse_ids']
+
+	def mtgo_id(self):
+		return self.scryfallJson['mtgo_id']
+
+	def mtgo_foil_id(self):
+		return self.scryfallJson['mtgo_foil_id']
+
+	def name(self):
+		return self.scryfallJson['name']
+
+	def uri(self):
+		return self.scryfallJson['uri']
+
+	def scryfall_uri(self):
+		return self.scryfallJson['scryfall_uri']
+
+	def layout(self):
+		return self.scryfallJson['layout']
+
+	def highres_image(self):
+		return self.scryfallJson['highres_image']
+
+	def image_uris(self):
+		return self.scryfallJson['image_uris']
+
+	def cmc(self):
+		return self.scryfallJson['cmc']
+
+	def type_line(self):
+		return self.scryfallJson['type_line']
+
+	def oracle_text(self):
+		return self.scryfallJson['oracle_text']
+
+	def mana_cost(self):
+		return self.scryfallJson['mana_cost']
+
+	def colors(self):
+		return self.scryfallJson['colors']
+
+	def color_identity(self):
+		return self.scryfallJson['color_identity']
+
+	def legalities(self):
+		return self.scryfallJson['legalities']
+
+	def reserved(self):
+		return self.scryfallJson['reserved']
+
+	def reprint(self):
+		return self.scryfallJson['reprint']
+
+	def set(self):
+		return self.scryfallJson['set']
+
+	def set_name(self):
+		return self.scryfallJson['set_name']
+
+	def set_uri(self):
+		return self.scryfallJson['set_uri']
+
+	def set_search_uri(self):
+		return self.scryfallJson['set_search_uri']
+
+	def scryfall_set_uri(self):
+		return self.scryfallJson['scryfall_set_uri']
+
+	def rulings_uri(self):
+		return self.scryfallJson['rulings_uri']
+
+	def prints_search_uri(self):
+		return self.scryfallJson['prints_search_uri']
+
+	def collector_number(self):
+		return self.scryfallJson['collector_number']
+
+	def digital(self):
+		return self.scryfallJson['digital']
+
+	def rarity(self):
+		return self.scryfallJson['rarity']
+
+	def illustration_id(self):
+		return self.scryfallJson['illustration_id']
+
+	def artist(self):
+		return self.scryfallJson['artist']
+
+	def frame(self):
+		return self.scryfallJson['frame']
+
+	def full_art(self):
+		return self.scryfallJson['full_art']
+
+	def border_color(self):
+		return self.scryfallJson['border_color']
+
+	def timeshifted(self):
+		return self.scryfallJson['timeshifted']
+
+	def colorshifted(self):
+		return self.scryfallJson['colorshifted']
+
+	def futureshifted(self):
+		return self.scryfallJson['futureshifted']
+
+	def edhrec_rank(self):
+		return self.scryfallJson['edhrec_rank']
+
+	def tix(self):
+		return self.scryfallJson['tix']
+
+	def related_uris(self):
+		return self.scryfallJson['related_uris']
+
+	def purchase_uris(self):
+		return self.scryfallJson['purchase_uris']
diff --git a/cards/mtgo.py b/cards/mtgo.py
new file mode 100644
index 0000000..e41789f
--- /dev/null
+++ b/cards/mtgo.py
@@ -0,0 +1,214 @@
+import asyncio, aiohttp
+import json
+
+class Mtgo(object):
+	""" cards/named
+
+	Parameters:
+		id: int					The multiverse id of the card.
+		format: str				The data format to return: json, text, or image. Defaults to json.
+		face: str				If using the image format and this parameter has the value back,
+									the back face of the card will be returned.
+									Will return a 404 if this card has no back face.
+		version: str			The image version to return when using the image
+									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
+		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+
+	Attributes:
+		object: str				Returns the type of object it is. (card, error, etc)
+		id: str					The scryfall id of the card.
+		multiverse_ids: arr		The associated multiverse ids of the card.
+		mtgo_id: int			The Magic Online id of the card.
+		mtgo_foil_id: int		The Magic Online foil id of the card.
+		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
+		uri: str				The Scryfall API uri for the card.
+		scryfall_uri: str		The full Scryfall page of the card.
+		layout: str				The image layout of the card. (normal, transform, etc)
+		highres_image: bool		Returns True if the card has a high res image.
+		card.image_uris: dict	All image uris of the card in various qualities.
+		cmc: float				A float of the converted mana cost of the card.
+		type_line: str			The full type line of the card.
+		oracle_text: str		The official oracle text of a card.
+		mana_cost: str			The full mana cost using shorthanded mana symbols.
+		colors: arr				An array of strings with all colors found in the mana cost.
+		color_identity: arr		An array of strings with all colors found in on the card itself.
+		legalities: dict		A dictionary of all formats and their legality.
+		reserved: bool			Returns True if the card is on the reserved list.
+		reprint: bool			Returns True if the card has been reprinted before.
+		set: str				The 3 letter code for the set of the card.
+		set_name: str			The full name for the set of the card.
+		set_uri: str			The API uri for the full set list of the card.
+		set_search_uri: str		Same output as set_uri.
+		scryfall_set_uri: str	The full link to the set on Scryfall.
+		rulings_uri: str		The API uri for the rulings of the card.
+		prints_search_uri: str	TODO: Figure out what this does.
+		collector_number: str	The collector number of the card.
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
+	"""
+
+	def __init__(self, _id, _format=None, face=None, version=None, pretty=None):
+		self.mtgoid = _id
+		self.format = _format
+		self.face = face
+		self.version = version
+		self.pretty = pretty
+		loop = asyncio.get_event_loop()
+		self.session = aiohttp.ClientSession(loop=loop)
+
+		async def getRequest(url, **kwargs):
+			async with self.session.get(url, **kwargs) as response:
+				return await response.json()
+
+		self.scryfallJson = loop.run_until_complete(getRequest(
+			url='https://api.scryfall.com/cards/mtgo/{}'.format(self.mtgoid),
+			params={
+				'format':self.format,
+				'face':self.face,
+				'version':self.version,
+				'pretty':self.pretty
+			}))
+
+		if self.scryfallJson['object'] == 'error':
+			raise Exception(self.scryfallJson['details'])
+			self.session.close()
+
+		self.session.close()
+
+	def object(self):
+		return self.scryfallJson['object']
+
+	def id(self):
+		return self.scryfallJson['id']
+
+	def multiverse_ids(self):
+		return self.scryfallJson['multiverse_ids']
+
+	def mtgo_id(self):
+		return self.scryfallJson['mtgo_id']
+
+	def mtgo_foil_id(self):
+		return self.scryfallJson['mtgo_foil_id']
+
+	def name(self):
+		return self.scryfallJson['name']
+
+	def uri(self):
+		return self.scryfallJson['uri']
+
+	def scryfall_uri(self):
+		return self.scryfallJson['scryfall_uri']
+
+	def layout(self):
+		return self.scryfallJson['layout']
+
+	def highres_image(self):
+		return self.scryfallJson['highres_image']
+
+	def image_uris(self):
+		return self.scryfallJson['image_uris']
+
+	def cmc(self):
+		return self.scryfallJson['cmc']
+
+	def type_line(self):
+		return self.scryfallJson['type_line']
+
+	def oracle_text(self):
+		return self.scryfallJson['oracle_text']
+
+	def mana_cost(self):
+		return self.scryfallJson['mana_cost']
+
+	def colors(self):
+		return self.scryfallJson['colors']
+
+	def color_identity(self):
+		return self.scryfallJson['color_identity']
+
+	def legalities(self):
+		return self.scryfallJson['legalities']
+
+	def reserved(self):
+		return self.scryfallJson['reserved']
+
+	def reprint(self):
+		return self.scryfallJson['reprint']
+
+	def set(self):
+		return self.scryfallJson['set']
+
+	def set_name(self):
+		return self.scryfallJson['set_name']
+
+	def set_uri(self):
+		return self.scryfallJson['set_uri']
+
+	def set_search_uri(self):
+		return self.scryfallJson['set_search_uri']
+
+	def scryfall_set_uri(self):
+		return self.scryfallJson['scryfall_set_uri']
+
+	def rulings_uri(self):
+		return self.scryfallJson['rulings_uri']
+
+	def prints_search_uri(self):
+		return self.scryfallJson['prints_search_uri']
+
+	def collector_number(self):
+		return self.scryfallJson['collector_number']
+
+	def digital(self):
+		return self.scryfallJson['digital']
+
+	def rarity(self):
+		return self.scryfallJson['rarity']
+
+	def illustration_id(self):
+		return self.scryfallJson['illustration_id']
+
+	def artist(self):
+		return self.scryfallJson['artist']
+
+	def frame(self):
+		return self.scryfallJson['frame']
+
+	def full_art(self):
+		return self.scryfallJson['full_art']
+
+	def border_color(self):
+		return self.scryfallJson['border_color']
+
+	def timeshifted(self):
+		return self.scryfallJson['timeshifted']
+
+	def colorshifted(self):
+		return self.scryfallJson['colorshifted']
+
+	def futureshifted(self):
+		return self.scryfallJson['futureshifted']
+
+	def edhrec_rank(self):
+		return self.scryfallJson['edhrec_rank']
+
+	def tix(self):
+		return self.scryfallJson['tix']
+
+	def related_uris(self):
+		return self.scryfallJson['related_uris']
+
+	def purchase_uris(self):
+		return self.scryfallJson['purchase_uris']
diff --git a/cards/multiverse.py b/cards/multiverse.py
new file mode 100644
index 0000000..7c91588
--- /dev/null
+++ b/cards/multiverse.py
@@ -0,0 +1,214 @@
+import asyncio, aiohttp
+import json
+
+class Multiverse(object):
+	""" cards/named
+
+	Parameters:
+		id: int					The multiverse id of the card.
+		format: str				The data format to return: json, text, or image. Defaults to json.
+		face: str				If using the image format and this parameter has the value back,
+									the back face of the card will be returned.
+									Will return a 404 if this card has no back face.
+		version: str			The image version to return when using the image
+									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
+		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+
+	Attributes:
+		object: str				Returns the type of object it is. (card, error, etc)
+		id: str					The scryfall id of the card.
+		multiverse_ids: arr		The associated multiverse ids of the card.
+		mtgo_id: int			The Magic Online id of the card.
+		mtgo_foil_id: int		The Magic Online foil id of the card.
+		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
+		uri: str				The Scryfall API uri for the card.
+		scryfall_uri: str		The full Scryfall page of the card.
+		layout: str				The image layout of the card. (normal, transform, etc)
+		highres_image: bool		Returns True if the card has a high res image.
+		card.image_uris: dict	All image uris of the card in various qualities.
+		cmc: float				A float of the converted mana cost of the card.
+		type_line: str			The full type line of the card.
+		oracle_text: str		The official oracle text of a card.
+		mana_cost: str			The full mana cost using shorthanded mana symbols.
+		colors: arr				An array of strings with all colors found in the mana cost.
+		color_identity: arr		An array of strings with all colors found in on the card itself.
+		legalities: dict		A dictionary of all formats and their legality.
+		reserved: bool			Returns True if the card is on the reserved list.
+		reprint: bool			Returns True if the card has been reprinted before.
+		set: str				The 3 letter code for the set of the card.
+		set_name: str			The full name for the set of the card.
+		set_uri: str			The API uri for the full set list of the card.
+		set_search_uri: str		Same output as set_uri.
+		scryfall_set_uri: str	The full link to the set on Scryfall.
+		rulings_uri: str		The API uri for the rulings of the card.
+		prints_search_uri: str	TODO: Figure out what this does.
+		collector_number: str	The collector number of the card.
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
+	"""
+
+	def __init__(self, _id, _format=None, face=None, version=None, pretty=None):
+		self.multiverseid = _id
+		self.format = _format
+		self.face = face
+		self.version = version
+		self.pretty = pretty
+		loop = asyncio.get_event_loop()
+		self.session = aiohttp.ClientSession(loop=loop)
+
+		async def getRequest(url, **kwargs):
+			async with self.session.get(url, **kwargs) as response:
+				return await response.json()
+
+		self.scryfallJson = loop.run_until_complete(getRequest(
+			url='https://api.scryfall.com/cards/multiverse/{}'.format(self.multiverseid),
+			params={
+				'format':self.format,
+				'face':self.face,
+				'version':self.version,
+				'pretty':self.pretty
+			}))
+
+		if self.scryfallJson['object'] == 'error':
+			raise Exception(self.scryfallJson['details'])
+			self.session.close()
+
+		self.session.close()
+
+	def object(self):
+		return self.scryfallJson['object']
+
+	def id(self):
+		return self.scryfallJson['id']
+
+	def multiverse_ids(self):
+		return self.scryfallJson['multiverse_ids']
+
+	def mtgo_id(self):
+		return self.scryfallJson['mtgo_id']
+
+	def mtgo_foil_id(self):
+		return self.scryfallJson['mtgo_foil_id']
+
+	def name(self):
+		return self.scryfallJson['name']
+
+	def uri(self):
+		return self.scryfallJson['uri']
+
+	def scryfall_uri(self):
+		return self.scryfallJson['scryfall_uri']
+
+	def layout(self):
+		return self.scryfallJson['layout']
+
+	def highres_image(self):
+		return self.scryfallJson['highres_image']
+
+	def image_uris(self):
+		return self.scryfallJson['image_uris']
+
+	def cmc(self):
+		return self.scryfallJson['cmc']
+
+	def type_line(self):
+		return self.scryfallJson['type_line']
+
+	def oracle_text(self):
+		return self.scryfallJson['oracle_text']
+
+	def mana_cost(self):
+		return self.scryfallJson['mana_cost']
+
+	def colors(self):
+		return self.scryfallJson['colors']
+
+	def color_identity(self):
+		return self.scryfallJson['color_identity']
+
+	def legalities(self):
+		return self.scryfallJson['legalities']
+
+	def reserved(self):
+		return self.scryfallJson['reserved']
+
+	def reprint(self):
+		return self.scryfallJson['reprint']
+
+	def set(self):
+		return self.scryfallJson['set']
+
+	def set_name(self):
+		return self.scryfallJson['set_name']
+
+	def set_uri(self):
+		return self.scryfallJson['set_uri']
+
+	def set_search_uri(self):
+		return self.scryfallJson['set_search_uri']
+
+	def scryfall_set_uri(self):
+		return self.scryfallJson['scryfall_set_uri']
+
+	def rulings_uri(self):
+		return self.scryfallJson['rulings_uri']
+
+	def prints_search_uri(self):
+		return self.scryfallJson['prints_search_uri']
+
+	def collector_number(self):
+		return self.scryfallJson['collector_number']
+
+	def digital(self):
+		return self.scryfallJson['digital']
+
+	def rarity(self):
+		return self.scryfallJson['rarity']
+
+	def illustration_id(self):
+		return self.scryfallJson['illustration_id']
+
+	def artist(self):
+		return self.scryfallJson['artist']
+
+	def frame(self):
+		return self.scryfallJson['frame']
+
+	def full_art(self):
+		return self.scryfallJson['full_art']
+
+	def border_color(self):
+		return self.scryfallJson['border_color']
+
+	def timeshifted(self):
+		return self.scryfallJson['timeshifted']
+
+	def colorshifted(self):
+		return self.scryfallJson['colorshifted']
+
+	def futureshifted(self):
+		return self.scryfallJson['futureshifted']
+
+	def edhrec_rank(self):
+		return self.scryfallJson['edhrec_rank']
+
+	def tix(self):
+		return self.scryfallJson['tix']
+
+	def related_uris(self):
+		return self.scryfallJson['related_uris']
+
+	def purchase_uris(self):
+		return self.scryfallJson['purchase_uris']
diff --git a/cards/named.py b/cards/named.py
index 2bb7e31..5d088b6 100644
--- a/cards/named.py
+++ b/cards/named.py
@@ -45,7 +45,20 @@ class Named(object):
 		rulings_uri: str		The API uri for the rulings of the card.
 		prints_search_uri: str	TODO: Figure out what this does.
 		collector_number: str	The collector number of the card.
-
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
 
 	def __init__(self, exact=None, fuzzy=None, _set=None, _format=None, face=None, version=None, pretty=None):
@@ -75,6 +88,10 @@ class Named(object):
 				'pretty':self.pretty
 			}))
 
+		if self.scryfallJson['object'] == 'error':
+			self.session.close()
+			raise Exception(self.scryfallJson['details'])
+
 		self.session.close()
 
 	def object(self):
diff --git a/cards/randomcard.py b/cards/randomcard.py
new file mode 100644
index 0000000..5ebc23e
--- /dev/null
+++ b/cards/randomcard.py
@@ -0,0 +1,212 @@
+import asyncio, aiohttp
+import json
+
+class RandomCard(object):
+	""" cards/named
+
+	Parameters:
+		format: str				The data format to return: json, text, or image. Defaults to json.
+		face: str				If using the image format and this parameter has the value back,
+									the back face of the card will be returned.
+									Will return a 404 if this card has no back face.
+		version: str			The image version to return when using the image
+									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
+		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+
+	Attributes:
+		object: str				Returns the type of object it is. (card, error, etc)
+		id: str					The scryfall id of the card.
+		multiverse_ids: arr		The associated multiverse ids of the card.
+		mtgo_id: int			The Magic Online id of the card.
+		mtgo_foil_id: int		The Magic Online foil id of the card.
+		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
+		uri: str				The Scryfall API uri for the card.
+		scryfall_uri: str		The full Scryfall page of the card.
+		layout: str				The image layout of the card. (normal, transform, etc)
+		highres_image: bool		Returns True if the card has a high res image.
+		card.image_uris: dict	All image uris of the card in various qualities.
+		cmc: float				A float of the converted mana cost of the card.
+		type_line: str			The full type line of the card.
+		oracle_text: str		The official oracle text of a card.
+		mana_cost: str			The full mana cost using shorthanded mana symbols.
+		colors: arr				An array of strings with all colors found in the mana cost.
+		color_identity: arr		An array of strings with all colors found in on the card itself.
+		legalities: dict		A dictionary of all formats and their legality.
+		reserved: bool			Returns True if the card is on the reserved list.
+		reprint: bool			Returns True if the card has been reprinted before.
+		set: str				The 3 letter code for the set of the card.
+		set_name: str			The full name for the set of the card.
+		set_uri: str			The API uri for the full set list of the card.
+		set_search_uri: str		Same output as set_uri.
+		scryfall_set_uri: str	The full link to the set on Scryfall.
+		rulings_uri: str		The API uri for the rulings of the card.
+		prints_search_uri: str	TODO: Figure out what this does.
+		collector_number: str	The collector number of the card.
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
+	"""
+
+	def __init__(self, _format=None, face=None, version=None, pretty=None):
+		self.format = _format
+		self.face = face
+		self.version = version
+		self.pretty = pretty
+		loop = asyncio.get_event_loop()
+		self.session = aiohttp.ClientSession(loop=loop)
+
+		async def getRequest(url, **kwargs):
+			async with self.session.get(url, **kwargs) as response:
+				return await response.json()
+
+		self.scryfallJson = loop.run_until_complete(getRequest(
+			url='https://api.scryfall.com/cards/random?',
+			params={
+				'format':self.format,
+				'face':self.face,
+				'version':self.version,
+				'pretty':self.pretty
+			}))
+			
+		if self.scryfallJson['object'] == 'error':
+			raise Exception(self.scryfallJson['details'])
+			self.session.close()
+
+		self.session.close()
+
+	def object(self):
+		return self.scryfallJson['object']
+
+	def id(self):
+		return self.scryfallJson['id']
+
+	def multiverse_ids(self):
+		return self.scryfallJson['multiverse_ids']
+
+	def mtgo_id(self):
+		return self.scryfallJson['mtgo_id']
+
+	def mtgo_foil_id(self):
+		return self.scryfallJson['mtgo_foil_id']
+
+	def name(self):
+		return self.scryfallJson['name']
+
+	def uri(self):
+		return self.scryfallJson['uri']
+
+	def scryfall_uri(self):
+		return self.scryfallJson['scryfall_uri']
+
+	def layout(self):
+		return self.scryfallJson['layout']
+
+	def highres_image(self):
+		return self.scryfallJson['highres_image']
+
+	def image_uris(self):
+		return self.scryfallJson['image_uris']
+
+	def cmc(self):
+		return self.scryfallJson['cmc']
+
+	def type_line(self):
+		return self.scryfallJson['type_line']
+
+	def oracle_text(self):
+		return self.scryfallJson['oracle_text']
+
+	def mana_cost(self):
+		return self.scryfallJson['mana_cost']
+
+	def colors(self):
+		return self.scryfallJson['colors']
+
+	def color_identity(self):
+		return self.scryfallJson['color_identity']
+
+	def legalities(self):
+		return self.scryfallJson['legalities']
+
+	def reserved(self):
+		return self.scryfallJson['reserved']
+
+	def reprint(self):
+		return self.scryfallJson['reprint']
+
+	def set(self):
+		return self.scryfallJson['set']
+
+	def set_name(self):
+		return self.scryfallJson['set_name']
+
+	def set_uri(self):
+		return self.scryfallJson['set_uri']
+
+	def set_search_uri(self):
+		return self.scryfallJson['set_search_uri']
+
+	def scryfall_set_uri(self):
+		return self.scryfallJson['scryfall_set_uri']
+
+	def rulings_uri(self):
+		return self.scryfallJson['rulings_uri']
+
+	def prints_search_uri(self):
+		return self.scryfallJson['prints_search_uri']
+
+	def collector_number(self):
+		return self.scryfallJson['collector_number']
+
+	def digital(self):
+		return self.scryfallJson['digital']
+
+	def rarity(self):
+		return self.scryfallJson['rarity']
+
+	def illustration_id(self):
+		return self.scryfallJson['illustration_id']
+
+	def artist(self):
+		return self.scryfallJson['artist']
+
+	def frame(self):
+		return self.scryfallJson['frame']
+
+	def full_art(self):
+		return self.scryfallJson['full_art']
+
+	def border_color(self):
+		return self.scryfallJson['border_color']
+
+	def timeshifted(self):
+		return self.scryfallJson['timeshifted']
+
+	def colorshifted(self):
+		return self.scryfallJson['colorshifted']
+
+	def futureshifted(self):
+		return self.scryfallJson['futureshifted']
+
+	def edhrec_rank(self):
+		return self.scryfallJson['edhrec_rank']
+
+	def tix(self):
+		return self.scryfallJson['tix']
+
+	def related_uris(self):
+		return self.scryfallJson['related_uris']
+
+	def purchase_uris(self):
+		return self.scryfallJson['purchase_uris']

From 83df7a53875f4211cb87477e1ebcfd98dbee984a Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Wed, 10 Jan 2018 22:07:15 -0500
Subject: [PATCH 02/13] Updated docstrings of all cards modules.

---
 cards/collector.py  | 4 ++--
 cards/id.py         | 2 +-
 cards/mtgo.py       | 4 ++--
 cards/randomcard.py | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cards/collector.py b/cards/collector.py
index b51cef3..bbc8ad3 100644
--- a/cards/collector.py
+++ b/cards/collector.py
@@ -2,7 +2,7 @@ import asyncio, aiohttp
 import json
 
 class Collector(object):
-	""" cards/named
+	""" cards/:code/:collector_number
 
 	Parameters:
 		code: int				The 3 or 4 letter set code.
@@ -82,7 +82,7 @@ class Collector(object):
 				'version':self.version,
 				'pretty':self.pretty
 			}))
-			
+
 		if self.scryfallJson['object'] == 'error':
 			raise Exception(self.scryfallJson['details'])
 			self.session.close()
diff --git a/cards/id.py b/cards/id.py
index 18b7b69..24d88fc 100644
--- a/cards/id.py
+++ b/cards/id.py
@@ -2,7 +2,7 @@ import asyncio, aiohttp
 import json
 
 class Id(object):
-	""" cards/named
+	""" cards/:id
 
 	Parameters:
 		id: str					The Scryfall id of the card.
diff --git a/cards/mtgo.py b/cards/mtgo.py
index e41789f..5fc2207 100644
--- a/cards/mtgo.py
+++ b/cards/mtgo.py
@@ -2,10 +2,10 @@ import asyncio, aiohttp
 import json
 
 class Mtgo(object):
-	""" cards/named
+	""" cards/mtgo/:id
 
 	Parameters:
-		id: int					The multiverse id of the card.
+		id: int					The mtgo id of the card.
 		format: str				The data format to return: json, text, or image. Defaults to json.
 		face: str				If using the image format and this parameter has the value back,
 									the back face of the card will be returned.
diff --git a/cards/randomcard.py b/cards/randomcard.py
index 5ebc23e..1c79f09 100644
--- a/cards/randomcard.py
+++ b/cards/randomcard.py
@@ -2,7 +2,7 @@ import asyncio, aiohttp
 import json
 
 class RandomCard(object):
-	""" cards/named
+	""" cards/random
 
 	Parameters:
 		format: str				The data format to return: json, text, or image. Defaults to json.
@@ -78,7 +78,7 @@ class RandomCard(object):
 				'version':self.version,
 				'pretty':self.pretty
 			}))
-			
+
 		if self.scryfallJson['object'] == 'error':
 			raise Exception(self.scryfallJson['details'])
 			self.session.close()

From 42db37c69eb812f10bd009da5c10a2dd9d33c994 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Wed, 10 Jan 2018 22:50:10 -0500
Subject: [PATCH 03/13] Added currency attribute to randomcard.

---
 cards/randomcard.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/cards/randomcard.py b/cards/randomcard.py
index 1c79f09..c2624ed 100644
--- a/cards/randomcard.py
+++ b/cards/randomcard.py
@@ -53,7 +53,7 @@ class RandomCard(object):
 		colorshifted: bool		Returns True if the card is colorshifted.
 		futureshifted: bool		Returns True if the card is futureshifted.
 		edhrec_rank: int		The rank of the card on edhrec.com
-		tix: int				The MTGO price of the card
+		currency: str			The various currencies of the card. Modes are usd, eur, tix.
 		related_uris: dict		A dictionary of related websites for this card.
 		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
@@ -202,8 +202,11 @@ class RandomCard(object):
 	def edhrec_rank(self):
 		return self.scryfallJson['edhrec_rank']
 
-	def tix(self):
-		return self.scryfallJson['tix']
+	def currency(self, mode):
+		modes = ['usd', 'eur', 'tix']
+		if mode not in modes:
+			return KeyError("That currency is not available.")
+		return self.scryfallJson[mode]
 
 	def related_uris(self):
 		return self.scryfallJson['related_uris']

From 344fb532628bf65e5e91506f4c2bb88845b427f8 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Tue, 23 Jan 2018 12:41:56 -0500
Subject: [PATCH 04/13] Removed some naming conflicts and made imports work
 properly.

---
 __init__.py                | 7 +++++++
 cards/__init__.py          | 7 +++++++
 cards/{id.py => cardid.py} | 0
 cards/named.py             | 6 +++---
 4 files changed, 17 insertions(+), 3 deletions(-)
 rename cards/{id.py => cardid.py} (100%)

diff --git a/__init__.py b/__init__.py
index e69de29..2855c22 100644
--- a/__init__.py
+++ b/__init__.py
@@ -0,0 +1,7 @@
+from scrython.cards import Autocomplete
+from scrython.cards import Collector
+from scrython.cards import Id
+from scrython.cards import Mtgo
+from scrython.cards import Multiverse
+from scrython.cards import Named
+from scrython.cards import RandomCard
diff --git a/cards/__init__.py b/cards/__init__.py
index e69de29..08911e0 100644
--- a/cards/__init__.py
+++ b/cards/__init__.py
@@ -0,0 +1,7 @@
+from .autocomplete import Autocomplete
+from .collector import Collector
+from .cardid import Id
+from .mtgo import Mtgo
+from .multiverse import Multiverse
+from .named import Named
+from .randomcard import RandomCard
diff --git a/cards/id.py b/cards/cardid.py
similarity index 100%
rename from cards/id.py
rename to cards/cardid.py
diff --git a/cards/named.py b/cards/named.py
index 5d088b6..542945e 100644
--- a/cards/named.py
+++ b/cards/named.py
@@ -14,7 +14,7 @@ class Named(object):
 									Will return a 404 if this card has no back face.
 		version: str			The image version to return when using the image
 									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+		pretty: bool			If true, the returned JSON will be prettified. Avoid using for production code.
 
 	Attributes:
 		object: str				Returns the type of object it is. (card, error, etc)
@@ -27,13 +27,13 @@ class Named(object):
 		scryfall_uri: str		The full Scryfall page of the card.
 		layout: str				The image layout of the card. (normal, transform, etc)
 		highres_image: bool		Returns True if the card has a high res image.
-		card.image_uris: dict	All image uris of the card in various qualities.
+		card_image_uris: dict	All image uris of the card in various qualities.
 		cmc: float				A float of the converted mana cost of the card.
 		type_line: str			The full type line of the card.
 		oracle_text: str		The official oracle text of a card.
 		mana_cost: str			The full mana cost using shorthanded mana symbols.
 		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found in on the card itself.
+		color_identity: arr		An array of strings with all colors found on the card itself.
 		legalities: dict		A dictionary of all formats and their legality.
 		reserved: bool			Returns True if the card is on the reserved list.
 		reprint: bool			Returns True if the card has been reprinted before.

From f7899f11b430f9549f06f311ca2f5c52dc21e6f8 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Thu, 25 Jan 2018 15:27:56 -0500
Subject: [PATCH 05/13] I have no idea what was changed, committing to push.

---
 .idea/dictionaries/nanda.xml                 |  15 ++
 .idea/inspectionProfiles/Project_Default.xml |  21 ++
 .idea/misc.xml                               |   4 +
 .idea/modules.xml                            |   8 +
 .idea/scrython.iml                           |  11 +
 .idea/vcs.xml                                |   6 +
 .idea/workspace.xml                          | 235 +++++++++++++++++++
 cards/named.py                               |  19 +-
 cards/randomcard.py                          | 225 +++++++++---------
 cards/scryfall_object.py                     | 146 ++++++++++++
 requirements.txt                             |   1 +
 11 files changed, 570 insertions(+), 121 deletions(-)
 create mode 100644 .idea/dictionaries/nanda.xml
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/scrython.iml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 cards/scryfall_object.py

diff --git a/.idea/dictionaries/nanda.xml b/.idea/dictionaries/nanda.xml
new file mode 100644
index 0000000..a902a65
--- /dev/null
+++ b/.idea/dictionaries/nanda.xml
@@ -0,0 +1,15 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="nanda">
+    <words>
+      <w>colorshifted</w>
+      <w>edhrec</w>
+      <w>futureshifted</w>
+      <w>highres</w>
+      <w>mana</w>
+      <w>mtgo</w>
+      <w>multiverse</w>
+      <w>scryfall</w>
+      <w>timeshifted</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..d34c0a8
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,21 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="W191" />
+          <option value="E101" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N802" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyUnreachableCodeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..65531ca
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..7535cb7
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/scrython.iml" filepath="$PROJECT_DIR$/.idea/scrython.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/scrython.iml b/.idea/scrython.iml
new file mode 100644
index 0000000..6711606
--- /dev/null
+++ b/.idea/scrython.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..ab9295e
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="90008d80-8a8d-4e49-ac3c-faac0ecb9624" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/cards/named.py" afterPath="$PROJECT_DIR$/cards/named.py" />
+      <change beforePath="$PROJECT_DIR$/cards/randomcard.py" afterPath="$PROJECT_DIR$/cards/randomcard.py" />
+      <change beforePath="$PROJECT_DIR$/requirements.txt" afterPath="$PROJECT_DIR$/requirements.txt" />
+    </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <leaf>
+      <file leaf-file-name="scryfall_object.py" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/cards/scryfall_object.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="288">
+              <caret line="16" column="44" lean-forward="false" selection-start-line="16" selection-start-column="44" selection-end-line="16" selection-end-column="44" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="randomcard.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cards/randomcard.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1332">
+              <caret line="74" column="9" lean-forward="true" selection-start-line="74" selection-start-column="9" selection-end-line="74" selection-end-column="9" />
+              <folding>
+                <element signature="e#0#14#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="multiverse.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/cards/multiverse.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#23#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/cards/randomcard.py" />
+        <option value="$PROJECT_DIR$/cards/scryfall_object.py" />
+        <option value="$PROJECT_DIR$/cards/named.py" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="width" value="1366" />
+    <option name="height" value="743" />
+  </component>
+  <component name="ProjectInspectionProfilesVisibleTreeState">
+    <entry key="Project Default">
+      <profile-state>
+        <expanded-state>
+          <State>
+            <id />
+          </State>
+          <State>
+            <id>Python</id>
+          </State>
+        </expanded-state>
+        <selected-state>
+          <State>
+            <id>PyPep8Inspection</id>
+          </State>
+        </selected-state>
+      </profile-state>
+    </entry>
+  </component>
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="1" id="Add" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scope" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="scrython" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrython" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="scrython" type="b2602c69:ProjectViewProjectNode" />
+              <item name="scrython" type="462c0819:PsiDirectoryNode" />
+              <item name="cards" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scratches" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="90008d80-8a8d-4e49-ac3c-faac0ecb9624" name="Default" comment="" />
+      <created>1516750438711</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1516750438711</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="0" width="1366" height="743" extended-state="6" />
+    <layout>
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17349927" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <option name="time" value="2" />
+    </breakpoint-manager>
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/cards/named.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1494">
+          <caret line="83" column="12" lean-forward="true" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="12" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cards/multiverse.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#23#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cards/randomcard.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1332">
+          <caret line="74" column="9" lean-forward="true" selection-start-line="74" selection-start-column="9" selection-end-line="74" selection-end-column="9" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cards/scryfall_object.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="16" column="44" lean-forward="false" selection-start-line="16" selection-start-column="44" selection-end-line="16" selection-end-column="44" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/cards/named.py b/cards/named.py
index 542945e..ee667c2 100644
--- a/cards/named.py
+++ b/cards/named.py
@@ -1,5 +1,6 @@
-import asyncio, aiohttp
-import json
+import aiohttp
+import asyncio
+
 
 class Named(object):
 	""" cards/named
@@ -79,13 +80,13 @@ class Named(object):
 		self.scryfallJson = loop.run_until_complete(getRequest(
 			url='https://api.scryfall.com/cards/named?',
 			params={
-				'exact':self.exact,
-				'fuzzy':self.fuzzy,
-				'set':self.set,
-				'format':self.format,
-				'face':self.face,
-				'version':self.version,
-				'pretty':self.pretty
+				'exact': self.exact,
+				'fuzzy': self.fuzzy,
+				'set': self.set,
+				'format': self.format,
+				'face': self.face,
+				'version': self.version,
+				'pretty': self.pretty
 			}))
 
 		if self.scryfallJson['object'] == 'error':
diff --git a/cards/randomcard.py b/cards/randomcard.py
index c2624ed..e9bcad8 100644
--- a/cards/randomcard.py
+++ b/cards/randomcard.py
@@ -1,8 +1,9 @@
-import asyncio, aiohttp
-import json
+import aiohttp
+import asyncio
+
 
 class RandomCard(object):
-	""" cards/random
+    """ cards/random
 
 	Parameters:
 		format: str				The data format to return: json, text, or image. Defaults to json.
@@ -58,158 +59,158 @@ class RandomCard(object):
 		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
 
-	def __init__(self, _format=None, face=None, version=None, pretty=None):
-		self.format = _format
-		self.face = face
-		self.version = version
-		self.pretty = pretty
-		loop = asyncio.get_event_loop()
-		self.session = aiohttp.ClientSession(loop=loop)
+    def __init__(self, **kwargs):
+        self.format = kwargs.get('format')
+        self.face = kwargs.get('face')
+        self.version = kwargs.get('version')
+        self.pretty = kwargs.get('pretty')
+        loop = asyncio.get_event_loop()
+        self.session = aiohttp.ClientSession(loop=loop)
 
-		async def getRequest(url, **kwargs):
-			async with self.session.get(url, **kwargs) as response:
-				return await response.json()
+        async def getRequest(url, **kwargs):
+            async with self.session.get(url, **kwargs) as response:
+                return await response.json()
 
-		self.scryfallJson = loop.run_until_complete(getRequest(
-			url='https://api.scryfall.com/cards/random?',
-			params={
-				'format':self.format,
-				'face':self.face,
-				'version':self.version,
-				'pretty':self.pretty
-			}))
+        self.scryfallJson = loop.run_until_complete(getRequest(
+            url='https://api.scryfall.com/cards/random?',
+            params={
+                'format': self.format,
+                'face': self.face,
+                'version': self.version,
+                'pretty': self.pretty
+            }))
 
-		if self.scryfallJson['object'] == 'error':
-			raise Exception(self.scryfallJson['details'])
-			self.session.close()
+        if self.scryfallJson['object'] == 'error':
+            raise Exception(self.scryfallJson['details'])
+            self.session.close()
 
-		self.session.close()
+        self.session.close()
 
-	def object(self):
-		return self.scryfallJson['object']
+    def object(self):
+        return self.scryfallJson['object']
 
-	def id(self):
-		return self.scryfallJson['id']
+    def id(self):
+        return self.scryfallJson['id']
 
-	def multiverse_ids(self):
-		return self.scryfallJson['multiverse_ids']
+    def multiverse_ids(self):
+        return self.scryfallJson['multiverse_ids']
 
-	def mtgo_id(self):
-		return self.scryfallJson['mtgo_id']
+    def mtgo_id(self):
+        return self.scryfallJson['mtgo_id']
 
-	def mtgo_foil_id(self):
-		return self.scryfallJson['mtgo_foil_id']
+    def mtgo_foil_id(self):
+        return self.scryfallJson['mtgo_foil_id']
 
-	def name(self):
-		return self.scryfallJson['name']
+    def name(self):
+        return self.scryfallJson['name']
 
-	def uri(self):
-		return self.scryfallJson['uri']
+    def uri(self):
+        return self.scryfallJson['uri']
 
-	def scryfall_uri(self):
-		return self.scryfallJson['scryfall_uri']
+    def scryfall_uri(self):
+        return self.scryfallJson['scryfall_uri']
 
-	def layout(self):
-		return self.scryfallJson['layout']
+    def layout(self):
+        return self.scryfallJson['layout']
 
-	def highres_image(self):
-		return self.scryfallJson['highres_image']
+    def highres_image(self):
+        return self.scryfallJson['highres_image']
 
-	def image_uris(self):
-		return self.scryfallJson['image_uris']
+    def image_uris(self):
+        return self.scryfallJson['image_uris']
 
-	def cmc(self):
-		return self.scryfallJson['cmc']
+    def cmc(self):
+        return self.scryfallJson['cmc']
 
-	def type_line(self):
-		return self.scryfallJson['type_line']
+    def type_line(self):
+        return self.scryfallJson['type_line']
 
-	def oracle_text(self):
-		return self.scryfallJson['oracle_text']
+    def oracle_text(self):
+        return self.scryfallJson['oracle_text']
 
-	def mana_cost(self):
-		return self.scryfallJson['mana_cost']
+    def mana_cost(self):
+        return self.scryfallJson['mana_cost']
 
-	def colors(self):
-		return self.scryfallJson['colors']
+    def colors(self):
+        return self.scryfallJson['colors']
 
-	def color_identity(self):
-		return self.scryfallJson['color_identity']
+    def color_identity(self):
+        return self.scryfallJson['color_identity']
 
-	def legalities(self):
-		return self.scryfallJson['legalities']
+    def legalities(self):
+        return self.scryfallJson['legalities']
 
-	def reserved(self):
-		return self.scryfallJson['reserved']
+    def reserved(self):
+        return self.scryfallJson['reserved']
 
-	def reprint(self):
-		return self.scryfallJson['reprint']
+    def reprint(self):
+        return self.scryfallJson['reprint']
 
-	def set(self):
-		return self.scryfallJson['set']
+    def set(self):
+        return self.scryfallJson['set']
 
-	def set_name(self):
-		return self.scryfallJson['set_name']
+    def set_name(self):
+        return self.scryfallJson['set_name']
 
-	def set_uri(self):
-		return self.scryfallJson['set_uri']
+    def set_uri(self):
+        return self.scryfallJson['set_uri']
 
-	def set_search_uri(self):
-		return self.scryfallJson['set_search_uri']
+    def set_search_uri(self):
+        return self.scryfallJson['set_search_uri']
 
-	def scryfall_set_uri(self):
-		return self.scryfallJson['scryfall_set_uri']
+    def scryfall_set_uri(self):
+        return self.scryfallJson['scryfall_set_uri']
 
-	def rulings_uri(self):
-		return self.scryfallJson['rulings_uri']
+    def rulings_uri(self):
+        return self.scryfallJson['rulings_uri']
 
-	def prints_search_uri(self):
-		return self.scryfallJson['prints_search_uri']
+    def prints_search_uri(self):
+        return self.scryfallJson['prints_search_uri']
 
-	def collector_number(self):
-		return self.scryfallJson['collector_number']
+    def collector_number(self):
+        return self.scryfallJson['collector_number']
 
-	def digital(self):
-		return self.scryfallJson['digital']
+    def digital(self):
+        return self.scryfallJson['digital']
 
-	def rarity(self):
-		return self.scryfallJson['rarity']
+    def rarity(self):
+        return self.scryfallJson['rarity']
 
-	def illustration_id(self):
-		return self.scryfallJson['illustration_id']
+    def illustration_id(self):
+        return self.scryfallJson['illustration_id']
 
-	def artist(self):
-		return self.scryfallJson['artist']
+    def artist(self):
+        return self.scryfallJson['artist']
 
-	def frame(self):
-		return self.scryfallJson['frame']
+    def frame(self):
+        return self.scryfallJson['frame']
 
-	def full_art(self):
-		return self.scryfallJson['full_art']
+    def full_art(self):
+        return self.scryfallJson['full_art']
 
-	def border_color(self):
-		return self.scryfallJson['border_color']
+    def border_color(self):
+        return self.scryfallJson['border_color']
 
-	def timeshifted(self):
-		return self.scryfallJson['timeshifted']
+    def timeshifted(self):
+        return self.scryfallJson['timeshifted']
 
-	def colorshifted(self):
-		return self.scryfallJson['colorshifted']
+    def colorshifted(self):
+        return self.scryfallJson['colorshifted']
 
-	def futureshifted(self):
-		return self.scryfallJson['futureshifted']
+    def futureshifted(self):
+        return self.scryfallJson['futureshifted']
 
-	def edhrec_rank(self):
-		return self.scryfallJson['edhrec_rank']
+    def edhrec_rank(self):
+        return self.scryfallJson['edhrec_rank']
 
-	def currency(self, mode):
-		modes = ['usd', 'eur', 'tix']
-		if mode not in modes:
-			return KeyError("That currency is not available.")
-		return self.scryfallJson[mode]
+    def currency(self, mode):
+        modes = ['usd', 'eur', 'tix']
+        if mode not in modes:
+            return KeyError("That currency is not available.")
+        return self.scryfallJson[mode]
 
-	def related_uris(self):
-		return self.scryfallJson['related_uris']
+    def related_uris(self):
+        return self.scryfallJson['related_uris']
 
-	def purchase_uris(self):
-		return self.scryfallJson['purchase_uris']
+    def purchase_uris(self):
+        return self.scryfallJson['purchase_uris']
diff --git a/cards/scryfall_object.py b/cards/scryfall_object.py
new file mode 100644
index 0000000..d9beab5
--- /dev/null
+++ b/cards/scryfall_object.py
@@ -0,0 +1,146 @@
+import aiohttp
+import asyncio
+
+
+class ScryfallObject(object):
+	"""docstring for ScryfallObject."""
+	def __init__(self, **kwargs):
+		self.format = kwargs.get('format')
+		self.face = kwargs.get('face')
+		self.version = kwargs.get('version')
+		self.pretty = kwargs.get('pretty')
+		loop = asyncio.get_event_loop()
+		self.session = aiohttp.ClientSession(loop=loop)
+
+		async def getRequest(url, **kwargs):
+			async with self.session.get(url, **kwargs) as response:
+				return await response.json()
+
+	def object(self):
+		return self.scryfallJson['object']
+
+	def id(self):
+		return self.scryfallJson['id']
+
+	def multiverse_ids(self):
+		return self.scryfallJson['multiverse_ids']
+
+	def mtgo_id(self):
+		return self.scryfallJson['mtgo_id']
+
+	def mtgo_foil_id(self):
+		return self.scryfallJson['mtgo_foil_id']
+
+	def name(self):
+		return self.scryfallJson['name']
+
+	def uri(self):
+		return self.scryfallJson['uri']
+
+	def scryfall_uri(self):
+		return self.scryfallJson['scryfall_uri']
+
+	def layout(self):
+		return self.scryfallJson['layout']
+
+	def highres_image(self):
+		return self.scryfallJson['highres_image']
+
+	def image_uris(self):
+		return self.scryfallJson['image_uris']
+
+	def cmc(self):
+		return self.scryfallJson['cmc']
+
+	def type_line(self):
+		return self.scryfallJson['type_line']
+
+	def oracle_text(self):
+		return self.scryfallJson['oracle_text']
+
+	def mana_cost(self):
+		return self.scryfallJson['mana_cost']
+
+	def colors(self):
+		return self.scryfallJson['colors']
+
+	def color_identity(self):
+		return self.scryfallJson['color_identity']
+
+	def legalities(self):
+		return self.scryfallJson['legalities']
+
+	def reserved(self):
+		return self.scryfallJson['reserved']
+
+	def reprint(self):
+		return self.scryfallJson['reprint']
+
+	def set(self):
+		return self.scryfallJson['set']
+
+	def set_name(self):
+		return self.scryfallJson['set_name']
+
+	def set_uri(self):
+		return self.scryfallJson['set_uri']
+
+	def set_search_uri(self):
+		return self.scryfallJson['set_search_uri']
+
+	def scryfall_set_uri(self):
+		return self.scryfallJson['scryfall_set_uri']
+
+	def rulings_uri(self):
+		return self.scryfallJson['rulings_uri']
+
+	def prints_search_uri(self):
+		return self.scryfallJson['prints_search_uri']
+
+	def collector_number(self):
+		return self.scryfallJson['collector_number']
+
+	def digital(self):
+		return self.scryfallJson['digital']
+
+	def rarity(self):
+		return self.scryfallJson['rarity']
+
+	def illustration_id(self):
+		return self.scryfallJson['illustration_id']
+
+	def artist(self):
+		return self.scryfallJson['artist']
+
+	def frame(self):
+		return self.scryfallJson['frame']
+
+	def full_art(self):
+		return self.scryfallJson['full_art']
+
+	def border_color(self):
+		return self.scryfallJson['border_color']
+
+	def timeshifted(self):
+		return self.scryfallJson['timeshifted']
+
+	def colorshifted(self):
+		return self.scryfallJson['colorshifted']
+
+	def futureshifted(self):
+		return self.scryfallJson['futureshifted']
+
+	def edhrec_rank(self):
+		return self.scryfallJson['edhrec_rank']
+
+	def currency(self, mode):
+		modes = ['usd', 'eur', 'tix']
+		if mode not in modes:
+			return KeyError("That currency is not available.")
+		return self.scryfallJson[mode]
+
+	def related_uris(self):
+		return self.scryfallJson['related_uris']
+
+	def purchase_uris(self):
+		return self.scryfallJson['purchase_uris']
diff --git a/requirements.txt b/requirements.txt
index e84b373..c47b89f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
+aiohttp
 #Requirements for PyPI

From 25a9c450ed9b9149bb301119b6331116d2f76920 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Mon, 29 Jan 2018 22:32:08 -0500
Subject: [PATCH 06/13] Named, multiverse, and randomcard now inherit
 scryfall_object.

---
 cards/multiverse.py      | 218 ++-----------------------------------
 cards/named.py           | 229 +++------------------------------------
 cards/randomcard.py      | 220 +------------------------------------
 cards/scryfall_object.py |  77 ++++++++++++-
 4 files changed, 103 insertions(+), 641 deletions(-)

diff --git a/cards/multiverse.py b/cards/multiverse.py
index 7c91588..88e7ccc 100644
--- a/cards/multiverse.py
+++ b/cards/multiverse.py
@@ -1,214 +1,12 @@
-import asyncio, aiohttp
-import json
-
-class Multiverse(object):
-	""" cards/named
+from scryfall_object import ScryfallObject
 
+class Multiverse(ScryfallObject):
+	"""
 	Parameters:
-		id: int					The multiverse id of the card.
-		format: str				The data format to return: json, text, or image. Defaults to json.
-		face: str				If using the image format and this parameter has the value back,
-									the back face of the card will be returned.
-									Will return a 404 if this card has no back face.
-		version: str			The image version to return when using the image
-									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
-
-	Attributes:
-		object: str				Returns the type of object it is. (card, error, etc)
-		id: str					The scryfall id of the card.
-		multiverse_ids: arr		The associated multiverse ids of the card.
-		mtgo_id: int			The Magic Online id of the card.
-		mtgo_foil_id: int		The Magic Online foil id of the card.
-		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
-		uri: str				The Scryfall API uri for the card.
-		scryfall_uri: str		The full Scryfall page of the card.
-		layout: str				The image layout of the card. (normal, transform, etc)
-		highres_image: bool		Returns True if the card has a high res image.
-		card.image_uris: dict	All image uris of the card in various qualities.
-		cmc: float				A float of the converted mana cost of the card.
-		type_line: str			The full type line of the card.
-		oracle_text: str		The official oracle text of a card.
-		mana_cost: str			The full mana cost using shorthanded mana symbols.
-		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found in on the card itself.
-		legalities: dict		A dictionary of all formats and their legality.
-		reserved: bool			Returns True if the card is on the reserved list.
-		reprint: bool			Returns True if the card has been reprinted before.
-		set: str				The 3 letter code for the set of the card.
-		set_name: str			The full name for the set of the card.
-		set_uri: str			The API uri for the full set list of the card.
-		set_search_uri: str		Same output as set_uri.
-		scryfall_set_uri: str	The full link to the set on Scryfall.
-		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
-		collector_number: str	The collector number of the card.
-		digital: bool			Returns True if the card is the digital version.
-		rarity: str				The rarity of the card.
-		illustration_id: str	The related id of the card art.
-		artist: str				The artist of the card.
-		frame: str				The year of the card frame.
-		full_art: bool			Returns True if the card is considered full art.
-		border_color: str		The color of the card border.
-		timeshifted: bool		Returns True if the card is timeshifted.
-		colorshifted: bool		Returns True if the card is colorshifted.
-		futureshifted: bool		Returns True if the card is futureshifted.
-		edhrec_rank: int		The rank of the card on edhrec.com
-		tix: int				The MTGO price of the card
-		related_uris: dict		A dictionary of related websites for this card.
-		purchase_uris: dict		A dictionary of links to purchase the card.
+		id: int		The multiverse id of the card.
 	"""
 
-	def __init__(self, _id, _format=None, face=None, version=None, pretty=None):
-		self.multiverseid = _id
-		self.format = _format
-		self.face = face
-		self.version = version
-		self.pretty = pretty
-		loop = asyncio.get_event_loop()
-		self.session = aiohttp.ClientSession(loop=loop)
-
-		async def getRequest(url, **kwargs):
-			async with self.session.get(url, **kwargs) as response:
-				return await response.json()
-
-		self.scryfallJson = loop.run_until_complete(getRequest(
-			url='https://api.scryfall.com/cards/multiverse/{}'.format(self.multiverseid),
-			params={
-				'format':self.format,
-				'face':self.face,
-				'version':self.version,
-				'pretty':self.pretty
-			}))
-
-		if self.scryfallJson['object'] == 'error':
-			raise Exception(self.scryfallJson['details'])
-			self.session.close()
-
-		self.session.close()
-
-	def object(self):
-		return self.scryfallJson['object']
-
-	def id(self):
-		return self.scryfallJson['id']
-
-	def multiverse_ids(self):
-		return self.scryfallJson['multiverse_ids']
-
-	def mtgo_id(self):
-		return self.scryfallJson['mtgo_id']
-
-	def mtgo_foil_id(self):
-		return self.scryfallJson['mtgo_foil_id']
-
-	def name(self):
-		return self.scryfallJson['name']
-
-	def uri(self):
-		return self.scryfallJson['uri']
-
-	def scryfall_uri(self):
-		return self.scryfallJson['scryfall_uri']
-
-	def layout(self):
-		return self.scryfallJson['layout']
-
-	def highres_image(self):
-		return self.scryfallJson['highres_image']
-
-	def image_uris(self):
-		return self.scryfallJson['image_uris']
-
-	def cmc(self):
-		return self.scryfallJson['cmc']
-
-	def type_line(self):
-		return self.scryfallJson['type_line']
-
-	def oracle_text(self):
-		return self.scryfallJson['oracle_text']
-
-	def mana_cost(self):
-		return self.scryfallJson['mana_cost']
-
-	def colors(self):
-		return self.scryfallJson['colors']
-
-	def color_identity(self):
-		return self.scryfallJson['color_identity']
-
-	def legalities(self):
-		return self.scryfallJson['legalities']
-
-	def reserved(self):
-		return self.scryfallJson['reserved']
-
-	def reprint(self):
-		return self.scryfallJson['reprint']
-
-	def set(self):
-		return self.scryfallJson['set']
-
-	def set_name(self):
-		return self.scryfallJson['set_name']
-
-	def set_uri(self):
-		return self.scryfallJson['set_uri']
-
-	def set_search_uri(self):
-		return self.scryfallJson['set_search_uri']
-
-	def scryfall_set_uri(self):
-		return self.scryfallJson['scryfall_set_uri']
-
-	def rulings_uri(self):
-		return self.scryfallJson['rulings_uri']
-
-	def prints_search_uri(self):
-		return self.scryfallJson['prints_search_uri']
-
-	def collector_number(self):
-		return self.scryfallJson['collector_number']
-
-	def digital(self):
-		return self.scryfallJson['digital']
-
-	def rarity(self):
-		return self.scryfallJson['rarity']
-
-	def illustration_id(self):
-		return self.scryfallJson['illustration_id']
-
-	def artist(self):
-		return self.scryfallJson['artist']
-
-	def frame(self):
-		return self.scryfallJson['frame']
-
-	def full_art(self):
-		return self.scryfallJson['full_art']
-
-	def border_color(self):
-		return self.scryfallJson['border_color']
-
-	def timeshifted(self):
-		return self.scryfallJson['timeshifted']
-
-	def colorshifted(self):
-		return self.scryfallJson['colorshifted']
-
-	def futureshifted(self):
-		return self.scryfallJson['futureshifted']
-
-	def edhrec_rank(self):
-		return self.scryfallJson['edhrec_rank']
-
-	def tix(self):
-		return self.scryfallJson['tix']
-
-	def related_uris(self):
-		return self.scryfallJson['related_uris']
-
-	def purchase_uris(self):
-		return self.scryfallJson['purchase_uris']
+	def __init__(self, **kwargs):
+		self.multiverseid = kwargs.get('id')
+		self.url = 'cards/multiverse/' + self.multiverseid
+		super(Multiverse, self).__init__(self.url)
diff --git a/cards/named.py b/cards/named.py
index ee667c2..9df3d8a 100644
--- a/cards/named.py
+++ b/cards/named.py
@@ -1,222 +1,29 @@
-import aiohttp
-import asyncio
-
-
-class Named(object):
-	""" cards/named
+from scryfall_object import ScryfallObject
+import urllib.parse
 
+class Named(ScryfallObject):
+	"""
 	Parameters:
 		exact: str				The exact card name to search for, case insenstive.
 		fuzzy: str				A fuzzy card name to search for.
 		set: str				A set code to limit the search to one set.
-		format: str				The data format to return: json, text, or image. Defaults to json.
-		face: str				If using the image format and this parameter has the value back,
-									the back face of the card will be returned.
-									Will return a 404 if this card has no back face.
-		version: str			The image version to return when using the image
-									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool			If true, the returned JSON will be prettified. Avoid using for production code.
-
-	Attributes:
-		object: str				Returns the type of object it is. (card, error, etc)
-		id: str					The scryfall id of the card.
-		multiverse_ids: arr		The associated multiverse ids of the card.
-		mtgo_id: int			The Magic Online id of the card.
-		mtgo_foil_id: int		The Magic Online foil id of the card.
-		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
-		uri: str				The Scryfall API uri for the card.
-		scryfall_uri: str		The full Scryfall page of the card.
-		layout: str				The image layout of the card. (normal, transform, etc)
-		highres_image: bool		Returns True if the card has a high res image.
-		card_image_uris: dict	All image uris of the card in various qualities.
-		cmc: float				A float of the converted mana cost of the card.
-		type_line: str			The full type line of the card.
-		oracle_text: str		The official oracle text of a card.
-		mana_cost: str			The full mana cost using shorthanded mana symbols.
-		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found on the card itself.
-		legalities: dict		A dictionary of all formats and their legality.
-		reserved: bool			Returns True if the card is on the reserved list.
-		reprint: bool			Returns True if the card has been reprinted before.
-		set: str				The 3 letter code for the set of the card.
-		set_name: str			The full name for the set of the card.
-		set_uri: str			The API uri for the full set list of the card.
-		set_search_uri: str		Same output as set_uri.
-		scryfall_set_uri: str	The full link to the set on Scryfall.
-		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
-		collector_number: str	The collector number of the card.
-		digital: bool			Returns True if the card is the digital version.
-		rarity: str				The rarity of the card.
-		illustration_id: str	The related id of the card art.
-		artist: str				The artist of the card.
-		frame: str				The year of the card frame.
-		full_art: bool			Returns True if the card is considered full art.
-		border_color: str		The color of the card border.
-		timeshifted: bool		Returns True if the card is timeshifted.
-		colorshifted: bool		Returns True if the card is colorshifted.
-		futureshifted: bool		Returns True if the card is futureshifted.
-		edhrec_rank: int		The rank of the card on edhrec.com
-		tix: int				The MTGO price of the card
-		related_uris: dict		A dictionary of related websites for this card.
-		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
 
-	def __init__(self, exact=None, fuzzy=None, _set=None, _format=None, face=None, version=None, pretty=None):
-		self.exact = exact
-		self.fuzzy = fuzzy
-		self.set = _set
-		self.format = _format
-		self.face = face
-		self.version = version
-		self.pretty = pretty
-		loop = asyncio.get_event_loop()
-		self.session = aiohttp.ClientSession(loop=loop)
+	def __init__(self, **kwargs):
+		self.exact = kwargs.get('exact')
+		self.fuzzy = kwargs.get('fuzzy')
+		self.set = kwargs.get('set')
+		self.dict = {}
 
-		async def getRequest(url, **kwargs):
-			async with self.session.get(url, **kwargs) as response:
-				return await response.json()
+		if self.exact is not None:
+			self.dict['exact'] = self.exact
 
-		self.scryfallJson = loop.run_until_complete(getRequest(
-			url='https://api.scryfall.com/cards/named?',
-			params={
-				'exact': self.exact,
-				'fuzzy': self.fuzzy,
-				'set': self.set,
-				'format': self.format,
-				'face': self.face,
-				'version': self.version,
-				'pretty': self.pretty
-			}))
+		if self.fuzzy is not None:
+			self.dict['fuzzy'] = self.fuzzy
 
-		if self.scryfallJson['object'] == 'error':
-			self.session.close()
-			raise Exception(self.scryfallJson['details'])
+		if self.set is not None:
+			self.dict['set'] = self.set
 
-		self.session.close()
-
-	def object(self):
-		return self.scryfallJson['object']
-
-	def id(self):
-		return self.scryfallJson['id']
-
-	def multiverse_ids(self):
-		return self.scryfallJson['multiverse_ids']
-
-	def mtgo_id(self):
-		return self.scryfallJson['mtgo_id']
-
-	def mtgo_foil_id(self):
-		return self.scryfallJson['mtgo_foil_id']
-
-	def name(self):
-		return self.scryfallJson['name']
-
-	def uri(self):
-		return self.scryfallJson['uri']
-
-	def scryfall_uri(self):
-		return self.scryfallJson['scryfall_uri']
-
-	def layout(self):
-		return self.scryfallJson['layout']
-
-	def highres_image(self):
-		return self.scryfallJson['highres_image']
-
-	def image_uris(self):
-		return self.scryfallJson['image_uris']
-
-	def cmc(self):
-		return self.scryfallJson['cmc']
-
-	def type_line(self):
-		return self.scryfallJson['type_line']
-
-	def oracle_text(self):
-		return self.scryfallJson['oracle_text']
-
-	def mana_cost(self):
-		return self.scryfallJson['mana_cost']
-
-	def colors(self):
-		return self.scryfallJson['colors']
-
-	def color_identity(self):
-		return self.scryfallJson['color_identity']
-
-	def legalities(self):
-		return self.scryfallJson['legalities']
-
-	def reserved(self):
-		return self.scryfallJson['reserved']
-
-	def reprint(self):
-		return self.scryfallJson['reprint']
-
-	def set(self):
-		return self.scryfallJson['set']
-
-	def set_name(self):
-		return self.scryfallJson['set_name']
-
-	def set_uri(self):
-		return self.scryfallJson['set_uri']
-
-	def set_search_uri(self):
-		return self.scryfallJson['set_search_uri']
-
-	def scryfall_set_uri(self):
-		return self.scryfallJson['scryfall_set_uri']
-
-	def rulings_uri(self):
-		return self.scryfallJson['rulings_uri']
-
-	def prints_search_uri(self):
-		return self.scryfallJson['prints_search_uri']
-
-	def collector_number(self):
-		return self.scryfallJson['collector_number']
-
-	def digital(self):
-		return self.scryfallJson['digital']
-
-	def rarity(self):
-		return self.scryfallJson['rarity']
-
-	def illustration_id(self):
-		return self.scryfallJson['illustration_id']
-
-	def artist(self):
-		return self.scryfallJson['artist']
-
-	def frame(self):
-		return self.scryfallJson['frame']
-
-	def full_art(self):
-		return self.scryfallJson['full_art']
-
-	def border_color(self):
-		return self.scryfallJson['border_color']
-
-	def timeshifted(self):
-		return self.scryfallJson['timeshifted']
-
-	def colorshifted(self):
-		return self.scryfallJson['colorshifted']
-
-	def futureshifted(self):
-		return self.scryfallJson['futureshifted']
-
-	def edhrec_rank(self):
-		return self.scryfallJson['edhrec_rank']
-
-	def tix(self):
-		return self.scryfallJson['tix']
-
-	def related_uris(self):
-		return self.scryfallJson['related_uris']
-
-	def purchase_uris(self):
-		return self.scryfallJson['purchase_uris']
+		self.args = urllib.parse.urlencode(self.dict)
+		self.url = 'cards/named?' + self.args
+		super(Named, self).__init__(self.url)
diff --git a/cards/randomcard.py b/cards/randomcard.py
index e9bcad8..68737e9 100644
--- a/cards/randomcard.py
+++ b/cards/randomcard.py
@@ -1,216 +1,8 @@
-import aiohttp
-import asyncio
+from scryfall_object import ScryfallObject
 
 
-class RandomCard(object):
-    """ cards/random
-
-	Parameters:
-		format: str				The data format to return: json, text, or image. Defaults to json.
-		face: str				If using the image format and this parameter has the value back,
-									the back face of the card will be returned.
-									Will return a 404 if this card has no back face.
-		version: str			The image version to return when using the image
-									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
-
-	Attributes:
-		object: str				Returns the type of object it is. (card, error, etc)
-		id: str					The scryfall id of the card.
-		multiverse_ids: arr		The associated multiverse ids of the card.
-		mtgo_id: int			The Magic Online id of the card.
-		mtgo_foil_id: int		The Magic Online foil id of the card.
-		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
-		uri: str				The Scryfall API uri for the card.
-		scryfall_uri: str		The full Scryfall page of the card.
-		layout: str				The image layout of the card. (normal, transform, etc)
-		highres_image: bool		Returns True if the card has a high res image.
-		card.image_uris: dict	All image uris of the card in various qualities.
-		cmc: float				A float of the converted mana cost of the card.
-		type_line: str			The full type line of the card.
-		oracle_text: str		The official oracle text of a card.
-		mana_cost: str			The full mana cost using shorthanded mana symbols.
-		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found in on the card itself.
-		legalities: dict		A dictionary of all formats and their legality.
-		reserved: bool			Returns True if the card is on the reserved list.
-		reprint: bool			Returns True if the card has been reprinted before.
-		set: str				The 3 letter code for the set of the card.
-		set_name: str			The full name for the set of the card.
-		set_uri: str			The API uri for the full set list of the card.
-		set_search_uri: str		Same output as set_uri.
-		scryfall_set_uri: str	The full link to the set on Scryfall.
-		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
-		collector_number: str	The collector number of the card.
-		digital: bool			Returns True if the card is the digital version.
-		rarity: str				The rarity of the card.
-		illustration_id: str	The related id of the card art.
-		artist: str				The artist of the card.
-		frame: str				The year of the card frame.
-		full_art: bool			Returns True if the card is considered full art.
-		border_color: str		The color of the card border.
-		timeshifted: bool		Returns True if the card is timeshifted.
-		colorshifted: bool		Returns True if the card is colorshifted.
-		futureshifted: bool		Returns True if the card is futureshifted.
-		edhrec_rank: int		The rank of the card on edhrec.com
-		currency: str			The various currencies of the card. Modes are usd, eur, tix.
-		related_uris: dict		A dictionary of related websites for this card.
-		purchase_uris: dict		A dictionary of links to purchase the card.
-	"""
-
-    def __init__(self, **kwargs):
-        self.format = kwargs.get('format')
-        self.face = kwargs.get('face')
-        self.version = kwargs.get('version')
-        self.pretty = kwargs.get('pretty')
-        loop = asyncio.get_event_loop()
-        self.session = aiohttp.ClientSession(loop=loop)
-
-        async def getRequest(url, **kwargs):
-            async with self.session.get(url, **kwargs) as response:
-                return await response.json()
-
-        self.scryfallJson = loop.run_until_complete(getRequest(
-            url='https://api.scryfall.com/cards/random?',
-            params={
-                'format': self.format,
-                'face': self.face,
-                'version': self.version,
-                'pretty': self.pretty
-            }))
-
-        if self.scryfallJson['object'] == 'error':
-            raise Exception(self.scryfallJson['details'])
-            self.session.close()
-
-        self.session.close()
-
-    def object(self):
-        return self.scryfallJson['object']
-
-    def id(self):
-        return self.scryfallJson['id']
-
-    def multiverse_ids(self):
-        return self.scryfallJson['multiverse_ids']
-
-    def mtgo_id(self):
-        return self.scryfallJson['mtgo_id']
-
-    def mtgo_foil_id(self):
-        return self.scryfallJson['mtgo_foil_id']
-
-    def name(self):
-        return self.scryfallJson['name']
-
-    def uri(self):
-        return self.scryfallJson['uri']
-
-    def scryfall_uri(self):
-        return self.scryfallJson['scryfall_uri']
-
-    def layout(self):
-        return self.scryfallJson['layout']
-
-    def highres_image(self):
-        return self.scryfallJson['highres_image']
-
-    def image_uris(self):
-        return self.scryfallJson['image_uris']
-
-    def cmc(self):
-        return self.scryfallJson['cmc']
-
-    def type_line(self):
-        return self.scryfallJson['type_line']
-
-    def oracle_text(self):
-        return self.scryfallJson['oracle_text']
-
-    def mana_cost(self):
-        return self.scryfallJson['mana_cost']
-
-    def colors(self):
-        return self.scryfallJson['colors']
-
-    def color_identity(self):
-        return self.scryfallJson['color_identity']
-
-    def legalities(self):
-        return self.scryfallJson['legalities']
-
-    def reserved(self):
-        return self.scryfallJson['reserved']
-
-    def reprint(self):
-        return self.scryfallJson['reprint']
-
-    def set(self):
-        return self.scryfallJson['set']
-
-    def set_name(self):
-        return self.scryfallJson['set_name']
-
-    def set_uri(self):
-        return self.scryfallJson['set_uri']
-
-    def set_search_uri(self):
-        return self.scryfallJson['set_search_uri']
-
-    def scryfall_set_uri(self):
-        return self.scryfallJson['scryfall_set_uri']
-
-    def rulings_uri(self):
-        return self.scryfallJson['rulings_uri']
-
-    def prints_search_uri(self):
-        return self.scryfallJson['prints_search_uri']
-
-    def collector_number(self):
-        return self.scryfallJson['collector_number']
-
-    def digital(self):
-        return self.scryfallJson['digital']
-
-    def rarity(self):
-        return self.scryfallJson['rarity']
-
-    def illustration_id(self):
-        return self.scryfallJson['illustration_id']
-
-    def artist(self):
-        return self.scryfallJson['artist']
-
-    def frame(self):
-        return self.scryfallJson['frame']
-
-    def full_art(self):
-        return self.scryfallJson['full_art']
-
-    def border_color(self):
-        return self.scryfallJson['border_color']
-
-    def timeshifted(self):
-        return self.scryfallJson['timeshifted']
-
-    def colorshifted(self):
-        return self.scryfallJson['colorshifted']
-
-    def futureshifted(self):
-        return self.scryfallJson['futureshifted']
-
-    def edhrec_rank(self):
-        return self.scryfallJson['edhrec_rank']
-
-    def currency(self, mode):
-        modes = ['usd', 'eur', 'tix']
-        if mode not in modes:
-            return KeyError("That currency is not available.")
-        return self.scryfallJson[mode]
-
-    def related_uris(self):
-        return self.scryfallJson['related_uris']
-
-    def purchase_uris(self):
-        return self.scryfallJson['purchase_uris']
+class RandomCard(ScryfallObject):
+    """This will return a random card. No parameters are passed while creating."""
+    def __init__(self):
+        self.url = 'cards/random'
+        super(RandomCard, self).__init__(self.url)
diff --git a/cards/scryfall_object.py b/cards/scryfall_object.py
index d9beab5..45db750 100644
--- a/cards/scryfall_object.py
+++ b/cards/scryfall_object.py
@@ -3,12 +3,62 @@ import asyncio
 
 
 class ScryfallObject(object):
-	"""docstring for ScryfallObject."""
-	def __init__(self, **kwargs):
-		self.format = kwargs.get('format')
-		self.face = kwargs.get('face')
-		self.version = kwargs.get('version')
-		self.pretty = kwargs.get('pretty')
+	"""
+	Parameters:
+		format: str				The data format to return: json, text, or image. Defaults to json.
+		face: str				If using the image format and this parameter has the value back,
+									the back face of the card will be returned.
+									Will return a 404 if this card has no back face.
+		version: str			The image version to return when using the image
+									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
+		pretty: bool			If true, the returned JSON will be prettified. Avoid using for production code.
+
+	Attributes:
+		object: str				Returns the type of object it is. (card, error, etc)
+		id: str					The scryfall id of the card.
+		multiverse_ids: arr		The associated multiverse ids of the card.
+		mtgo_id: int			The Magic Online id of the card.
+		mtgo_foil_id: int		The Magic Online foil id of the card.
+		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
+		uri: str				The Scryfall API uri for the card.
+		scryfall_uri: str		The full Scryfall page of the card.
+		layout: str				The image layout of the card. (normal, transform, etc)
+		highres_image: bool		Returns True if the card has a high res image.
+		card_image_uris: dict	All image uris of the card in various qualities.
+		cmc: float				A float of the converted mana cost of the card.
+		type_line: str			The full type line of the card.
+		oracle_text: str		The official oracle text of a card.
+		mana_cost: str			The full mana cost using shorthanded mana symbols.
+		colors: arr				An array of strings with all colors found in the mana cost.
+		color_identity: arr		An array of strings with all colors found on the card itself.
+		legalities: dict		A dictionary of all formats and their legality.
+		reserved: bool			Returns True if the card is on the reserved list.
+		reprint: bool			Returns True if the card has been reprinted before.
+		set: str				The 3 letter code for the set of the card.
+		set_name: str			The full name for the set of the card.
+		set_uri: str			The API uri for the full set list of the card.
+		set_search_uri: str		Same output as set_uri.
+		scryfall_set_uri: str	The full link to the set on Scryfall.
+		rulings_uri: str		The API uri for the rulings of the card.
+		prints_search_uri: str	TODO: Figure out what this does.
+		collector_number: str	The collector number of the card.
+		digital: bool			Returns True if the card is the digital version.
+		rarity: str				The rarity of the card.
+		illustration_id: str	The related id of the card art.
+		artist: str				The artist of the card.
+		frame: str				The year of the card frame.
+		full_art: bool			Returns True if the card is considered full art.
+		border_color: str		The color of the card border.
+		timeshifted: bool		Returns True if the card is timeshifted.
+		colorshifted: bool		Returns True if the card is colorshifted.
+		futureshifted: bool		Returns True if the card is futureshifted.
+		edhrec_rank: int		The rank of the card on edhrec.com
+		tix: int				The MTGO price of the card
+		related_uris: dict		A dictionary of related websites for this card.
+		purchase_uris: dict		A dictionary of links to purchase the card.
+	"""
+	def __init__(self, _url, **kwargs):
+		self._url = 'https://api.scryfall.com/' + _url
 		loop = asyncio.get_event_loop()
 		self.session = aiohttp.ClientSession(loop=loop)
 
@@ -16,6 +66,21 @@ class ScryfallObject(object):
 			async with self.session.get(url, **kwargs) as response:
 				return await response.json()
 
+		self.scryfallJson = loop.run_until_complete(getRequest(
+			url = self._url,
+			params={
+				'format': kwargs.get('format'),
+				'face': kwargs.get('face'),
+				'version': kwargs.get('version'),
+				'pretty': kwargs.get('pretty')
+			}))
+
+		if self.scryfallJson['object'] == 'error':
+			self.session.close()
+			raise Exception(self.scryfallJson['details'])
+
+		self.session.close()
+
 	def object(self):
 		return self.scryfallJson['object']
 

From d8c4718eec3716d4e2a31753a3564e92670d6216 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Mon, 29 Jan 2018 22:54:20 -0500
Subject: [PATCH 07/13] Mtgo, Collector, and Cardid now inherit ScryfallObject.

---
 cards/autocomplete.py |   1 +
 cards/cardid.py       | 213 ++---------------------------------------
 cards/collector.py    | 217 ++----------------------------------------
 cards/mtgo.py         | 215 ++---------------------------------------
 4 files changed, 23 insertions(+), 623 deletions(-)

diff --git a/cards/autocomplete.py b/cards/autocomplete.py
index 0e705ec..ecddac2 100644
--- a/cards/autocomplete.py
+++ b/cards/autocomplete.py
@@ -5,6 +5,7 @@ class Autocomplete(object):
 	""" cards/autocomplete
 
 	Parameters:
+		query: str		The string to autocomplete.
 		format: str		The data format to return. Currently only supports JSON.
 		pretty: bool	If true, the returned JSON will be prettified. Avoid using for production code.
 
diff --git a/cards/cardid.py b/cards/cardid.py
index 24d88fc..73c098d 100644
--- a/cards/cardid.py
+++ b/cards/cardid.py
@@ -1,214 +1,13 @@
-import asyncio, aiohttp
-import json
+from scryfall_object import ScryfallObject
 
-class Id(object):
+class Id(ScryfallObject):
 	""" cards/:id
 
 	Parameters:
 		id: str					The Scryfall id of the card.
-		format: str				The data format to return: json, text, or image. Defaults to json.
-		face: str				If using the image format and this parameter has the value back,
-									the back face of the card will be returned.
-									Will return a 404 if this card has no back face.
-		version: str			The image version to return when using the image
-									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
-
-	Attributes:
-		object: str				Returns the type of object it is. (card, error, etc)
-		id: str					The scryfall id of the card.
-		multiverse_ids: arr		The associated multiverse ids of the card.
-		mtgo_id: int			The Magic Online id of the card.
-		mtgo_foil_id: int		The Magic Online foil id of the card.
-		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
-		uri: str				The Scryfall API uri for the card.
-		scryfall_uri: str		The full Scryfall page of the card.
-		layout: str				The image layout of the card. (normal, transform, etc)
-		highres_image: bool		Returns True if the card has a high res image.
-		card.image_uris: dict	All image uris of the card in various qualities.
-		cmc: float				A float of the converted mana cost of the card.
-		type_line: str			The full type line of the card.
-		oracle_text: str		The official oracle text of a card.
-		mana_cost: str			The full mana cost using shorthanded mana symbols.
-		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found in on the card itself.
-		legalities: dict		A dictionary of all formats and their legality.
-		reserved: bool			Returns True if the card is on the reserved list.
-		reprint: bool			Returns True if the card has been reprinted before.
-		set: str				The 3 letter code for the set of the card.
-		set_name: str			The full name for the set of the card.
-		set_uri: str			The API uri for the full set list of the card.
-		set_search_uri: str		Same output as set_uri.
-		scryfall_set_uri: str	The full link to the set on Scryfall.
-		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
-		collector_number: str	The collector number of the card.
-		digital: bool			Returns True if the card is the digital version.
-		rarity: str				The rarity of the card.
-		illustration_id: str	The related id of the card art.
-		artist: str				The artist of the card.
-		frame: str				The year of the card frame.
-		full_art: bool			Returns True if the card is considered full art.
-		border_color: str		The color of the card border.
-		timeshifted: bool		Returns True if the card is timeshifted.
-		colorshifted: bool		Returns True if the card is colorshifted.
-		futureshifted: bool		Returns True if the card is futureshifted.
-		edhrec_rank: int		The rank of the card on edhrec.com
-		tix: int				The MTGO price of the card
-		related_uris: dict		A dictionary of related websites for this card.
-		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
 
-	def __init__(self, _id, _format=None, face=None, version=None, pretty=None):
-		self.id = _id
-		self.format = _format
-		self.face = face
-		self.version = version
-		self.pretty = pretty
-		loop = asyncio.get_event_loop()
-		self.session = aiohttp.ClientSession(loop=loop)
-
-		async def getRequest(url, **kwargs):
-			async with self.session.get(url, **kwargs) as response:
-				return await response.json()
-
-		self.scryfallJson = loop.run_until_complete(getRequest(
-			url='https://api.scryfall.com/cards/{}'.format(self.id),
-			params={
-				'format':self.format,
-				'face':self.face,
-				'version':self.version,
-				'pretty':self.pretty
-			}))
-
-		if self.scryfallJson['object'] == 'error':
-			raise Exception(self.scryfallJson['details'])
-			self.session.close()
-
-		self.session.close()
-
-	def object(self):
-		return self.scryfallJson['object']
-
-	def id(self):
-		return self.scryfallJson['id']
-
-	def multiverse_ids(self):
-		return self.scryfallJson['multiverse_ids']
-
-	def mtgo_id(self):
-		return self.scryfallJson['mtgo_id']
-
-	def mtgo_foil_id(self):
-		return self.scryfallJson['mtgo_foil_id']
-
-	def name(self):
-		return self.scryfallJson['name']
-
-	def uri(self):
-		return self.scryfallJson['uri']
-
-	def scryfall_uri(self):
-		return self.scryfallJson['scryfall_uri']
-
-	def layout(self):
-		return self.scryfallJson['layout']
-
-	def highres_image(self):
-		return self.scryfallJson['highres_image']
-
-	def image_uris(self):
-		return self.scryfallJson['image_uris']
-
-	def cmc(self):
-		return self.scryfallJson['cmc']
-
-	def type_line(self):
-		return self.scryfallJson['type_line']
-
-	def oracle_text(self):
-		return self.scryfallJson['oracle_text']
-
-	def mana_cost(self):
-		return self.scryfallJson['mana_cost']
-
-	def colors(self):
-		return self.scryfallJson['colors']
-
-	def color_identity(self):
-		return self.scryfallJson['color_identity']
-
-	def legalities(self):
-		return self.scryfallJson['legalities']
-
-	def reserved(self):
-		return self.scryfallJson['reserved']
-
-	def reprint(self):
-		return self.scryfallJson['reprint']
-
-	def set(self):
-		return self.scryfallJson['set']
-
-	def set_name(self):
-		return self.scryfallJson['set_name']
-
-	def set_uri(self):
-		return self.scryfallJson['set_uri']
-
-	def set_search_uri(self):
-		return self.scryfallJson['set_search_uri']
-
-	def scryfall_set_uri(self):
-		return self.scryfallJson['scryfall_set_uri']
-
-	def rulings_uri(self):
-		return self.scryfallJson['rulings_uri']
-
-	def prints_search_uri(self):
-		return self.scryfallJson['prints_search_uri']
-
-	def collector_number(self):
-		return self.scryfallJson['collector_number']
-
-	def digital(self):
-		return self.scryfallJson['digital']
-
-	def rarity(self):
-		return self.scryfallJson['rarity']
-
-	def illustration_id(self):
-		return self.scryfallJson['illustration_id']
-
-	def artist(self):
-		return self.scryfallJson['artist']
-
-	def frame(self):
-		return self.scryfallJson['frame']
-
-	def full_art(self):
-		return self.scryfallJson['full_art']
-
-	def border_color(self):
-		return self.scryfallJson['border_color']
-
-	def timeshifted(self):
-		return self.scryfallJson['timeshifted']
-
-	def colorshifted(self):
-		return self.scryfallJson['colorshifted']
-
-	def futureshifted(self):
-		return self.scryfallJson['futureshifted']
-
-	def edhrec_rank(self):
-		return self.scryfallJson['edhrec_rank']
-
-	def tix(self):
-		return self.scryfallJson['tix']
-
-	def related_uris(self):
-		return self.scryfallJson['related_uris']
-
-	def purchase_uris(self):
-		return self.scryfallJson['purchase_uris']
+	def __init__(self, **kwargs):
+		self.id = kwargs.get('id')
+		self.url = 'cards/' + str(self.id)
+		super(Id, self).__init__(self.url)
diff --git a/cards/collector.py b/cards/collector.py
index bbc8ad3..776d50b 100644
--- a/cards/collector.py
+++ b/cards/collector.py
@@ -1,216 +1,15 @@
-import asyncio, aiohttp
-import json
+from scryfall_object import ScryfallObject
 
-class Collector(object):
+class Collector(ScryfallObject):
 	""" cards/:code/:collector_number
 
 	Parameters:
-		code: int				The 3 or 4 letter set code.
+		code: str				The 3 or 4 letter set code.
 		collector_number: int	The collector number of the card.
-		format: str				The data format to return: json, text, or image. Defaults to json.
-		face: str				If using the image format and this parameter has the value back,
-									the back face of the card will be returned.
-									Will return a 404 if this card has no back face.
-		version: str			The image version to return when using the image
-									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
-
-	Attributes:
-		object: str				Returns the type of object it is. (card, error, etc)
-		id: str					The scryfall id of the card.
-		multiverse_ids: arr		The associated multiverse ids of the card.
-		mtgo_id: int			The Magic Online id of the card.
-		mtgo_foil_id: int		The Magic Online foil id of the card.
-		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
-		uri: str				The Scryfall API uri for the card.
-		scryfall_uri: str		The full Scryfall page of the card.
-		layout: str				The image layout of the card. (normal, transform, etc)
-		highres_image: bool		Returns True if the card has a high res image.
-		card.image_uris: dict	All image uris of the card in various qualities.
-		cmc: float				A float of the converted mana cost of the card.
-		type_line: str			The full type line of the card.
-		oracle_text: str		The official oracle text of a card.
-		mana_cost: str			The full mana cost using shorthanded mana symbols.
-		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found in on the card itself.
-		legalities: dict		A dictionary of all formats and their legality.
-		reserved: bool			Returns True if the card is on the reserved list.
-		reprint: bool			Returns True if the card has been reprinted before.
-		set: str				The 3 letter code for the set of the card.
-		set_name: str			The full name for the set of the card.
-		set_uri: str			The API uri for the full set list of the card.
-		set_search_uri: str		Same output as set_uri.
-		scryfall_set_uri: str	The full link to the set on Scryfall.
-		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
-		collector_number: str	The collector number of the card.
-		digital: bool			Returns True if the card is the digital version.
-		rarity: str				The rarity of the card.
-		illustration_id: str	The related id of the card art.
-		artist: str				The artist of the card.
-		frame: str				The year of the card frame.
-		full_art: bool			Returns True if the card is considered full art.
-		border_color: str		The color of the card border.
-		timeshifted: bool		Returns True if the card is timeshifted.
-		colorshifted: bool		Returns True if the card is colorshifted.
-		futureshifted: bool		Returns True if the card is futureshifted.
-		edhrec_rank: int		The rank of the card on edhrec.com
-		tix: int				The MTGO price of the card
-		related_uris: dict		A dictionary of related websites for this card.
-		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
 
-	def __init__(self, code, collector_number, _format=None, face=None, version=None, pretty=None):
-		self.code = code
-		self.collector_number = collector_number
-		self.format = _format
-		self.face = face
-		self.version = version
-		self.pretty = pretty
-		loop = asyncio.get_event_loop()
-		self.session = aiohttp.ClientSession(loop=loop)
-
-		async def getRequest(url, **kwargs):
-			async with self.session.get(url, **kwargs) as response:
-				return await response.json()
-
-		self.scryfallJson = loop.run_until_complete(getRequest(
-			url='https://api.scryfall.com/cards/{}/{}'.format(self.code, self.collector_number),
-			params={
-				'format':self.format,
-				'face':self.face,
-				'version':self.version,
-				'pretty':self.pretty
-			}))
-
-		if self.scryfallJson['object'] == 'error':
-			raise Exception(self.scryfallJson['details'])
-			self.session.close()
-
-		self.session.close()
-
-	def object(self):
-		return self.scryfallJson['object']
-
-	def id(self):
-		return self.scryfallJson['id']
-
-	def multiverse_ids(self):
-		return self.scryfallJson['multiverse_ids']
-
-	def mtgo_id(self):
-		return self.scryfallJson['mtgo_id']
-
-	def mtgo_foil_id(self):
-		return self.scryfallJson['mtgo_foil_id']
-
-	def name(self):
-		return self.scryfallJson['name']
-
-	def uri(self):
-		return self.scryfallJson['uri']
-
-	def scryfall_uri(self):
-		return self.scryfallJson['scryfall_uri']
-
-	def layout(self):
-		return self.scryfallJson['layout']
-
-	def highres_image(self):
-		return self.scryfallJson['highres_image']
-
-	def image_uris(self):
-		return self.scryfallJson['image_uris']
-
-	def cmc(self):
-		return self.scryfallJson['cmc']
-
-	def type_line(self):
-		return self.scryfallJson['type_line']
-
-	def oracle_text(self):
-		return self.scryfallJson['oracle_text']
-
-	def mana_cost(self):
-		return self.scryfallJson['mana_cost']
-
-	def colors(self):
-		return self.scryfallJson['colors']
-
-	def color_identity(self):
-		return self.scryfallJson['color_identity']
-
-	def legalities(self):
-		return self.scryfallJson['legalities']
-
-	def reserved(self):
-		return self.scryfallJson['reserved']
-
-	def reprint(self):
-		return self.scryfallJson['reprint']
-
-	def set(self):
-		return self.scryfallJson['set']
-
-	def set_name(self):
-		return self.scryfallJson['set_name']
-
-	def set_uri(self):
-		return self.scryfallJson['set_uri']
-
-	def set_search_uri(self):
-		return self.scryfallJson['set_search_uri']
-
-	def scryfall_set_uri(self):
-		return self.scryfallJson['scryfall_set_uri']
-
-	def rulings_uri(self):
-		return self.scryfallJson['rulings_uri']
-
-	def prints_search_uri(self):
-		return self.scryfallJson['prints_search_uri']
-
-	def collector_number(self):
-		return self.scryfallJson['collector_number']
-
-	def digital(self):
-		return self.scryfallJson['digital']
-
-	def rarity(self):
-		return self.scryfallJson['rarity']
-
-	def illustration_id(self):
-		return self.scryfallJson['illustration_id']
-
-	def artist(self):
-		return self.scryfallJson['artist']
-
-	def frame(self):
-		return self.scryfallJson['frame']
-
-	def full_art(self):
-		return self.scryfallJson['full_art']
-
-	def border_color(self):
-		return self.scryfallJson['border_color']
-
-	def timeshifted(self):
-		return self.scryfallJson['timeshifted']
-
-	def colorshifted(self):
-		return self.scryfallJson['colorshifted']
-
-	def futureshifted(self):
-		return self.scryfallJson['futureshifted']
-
-	def edhrec_rank(self):
-		return self.scryfallJson['edhrec_rank']
-
-	def tix(self):
-		return self.scryfallJson['tix']
-
-	def related_uris(self):
-		return self.scryfallJson['related_uris']
-
-	def purchase_uris(self):
-		return self.scryfallJson['purchase_uris']
+	def __init__(self, **kwargs):
+		self.code = kwargs.get('code')
+		self.collector_number = kwargs.get('collector_number')
+		self.url = 'cards/{}/{}'.format(self.code, str(self.collector_number))
+		super(Collector, self).__init__(self.url)
diff --git a/cards/mtgo.py b/cards/mtgo.py
index 5fc2207..ee4aadb 100644
--- a/cards/mtgo.py
+++ b/cards/mtgo.py
@@ -1,214 +1,15 @@
-import asyncio, aiohttp
-import json
+from scryfall_object import ScryfallObject
+import urllib.parse
 
-class Mtgo(object):
+class Mtgo(ScryfallObject):
 	""" cards/mtgo/:id
 
 	Parameters:
-		id: int					The mtgo id of the card.
-		format: str				The data format to return: json, text, or image. Defaults to json.
-		face: str				If using the image format and this parameter has the value back,
-									the back face of the card will be returned.
-									Will return a 404 if this card has no back face.
-		version: str			The image version to return when using the image
-									format: small, normal, large, png, art_crop, or border_crop. Defaults to large.
-		pretty: bool				If true, the returned JSON will be prettified. Avoid using for production code.
+		id: int		The mtgo id of the card.
 
-	Attributes:
-		object: str				Returns the type of object it is. (card, error, etc)
-		id: str					The scryfall id of the card.
-		multiverse_ids: arr		The associated multiverse ids of the card.
-		mtgo_id: int			The Magic Online id of the card.
-		mtgo_foil_id: int		The Magic Online foil id of the card.
-		name: str				The full name of the card. Cards with multiple faces are named with '//' as a seperator.
-		uri: str				The Scryfall API uri for the card.
-		scryfall_uri: str		The full Scryfall page of the card.
-		layout: str				The image layout of the card. (normal, transform, etc)
-		highres_image: bool		Returns True if the card has a high res image.
-		card.image_uris: dict	All image uris of the card in various qualities.
-		cmc: float				A float of the converted mana cost of the card.
-		type_line: str			The full type line of the card.
-		oracle_text: str		The official oracle text of a card.
-		mana_cost: str			The full mana cost using shorthanded mana symbols.
-		colors: arr				An array of strings with all colors found in the mana cost.
-		color_identity: arr		An array of strings with all colors found in on the card itself.
-		legalities: dict		A dictionary of all formats and their legality.
-		reserved: bool			Returns True if the card is on the reserved list.
-		reprint: bool			Returns True if the card has been reprinted before.
-		set: str				The 3 letter code for the set of the card.
-		set_name: str			The full name for the set of the card.
-		set_uri: str			The API uri for the full set list of the card.
-		set_search_uri: str		Same output as set_uri.
-		scryfall_set_uri: str	The full link to the set on Scryfall.
-		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
-		collector_number: str	The collector number of the card.
-		digital: bool			Returns True if the card is the digital version.
-		rarity: str				The rarity of the card.
-		illustration_id: str	The related id of the card art.
-		artist: str				The artist of the card.
-		frame: str				The year of the card frame.
-		full_art: bool			Returns True if the card is considered full art.
-		border_color: str		The color of the card border.
-		timeshifted: bool		Returns True if the card is timeshifted.
-		colorshifted: bool		Returns True if the card is colorshifted.
-		futureshifted: bool		Returns True if the card is futureshifted.
-		edhrec_rank: int		The rank of the card on edhrec.com
-		tix: int				The MTGO price of the card
-		related_uris: dict		A dictionary of related websites for this card.
-		purchase_uris: dict		A dictionary of links to purchase the card.
 	"""
 
-	def __init__(self, _id, _format=None, face=None, version=None, pretty=None):
-		self.mtgoid = _id
-		self.format = _format
-		self.face = face
-		self.version = version
-		self.pretty = pretty
-		loop = asyncio.get_event_loop()
-		self.session = aiohttp.ClientSession(loop=loop)
-
-		async def getRequest(url, **kwargs):
-			async with self.session.get(url, **kwargs) as response:
-				return await response.json()
-
-		self.scryfallJson = loop.run_until_complete(getRequest(
-			url='https://api.scryfall.com/cards/mtgo/{}'.format(self.mtgoid),
-			params={
-				'format':self.format,
-				'face':self.face,
-				'version':self.version,
-				'pretty':self.pretty
-			}))
-
-		if self.scryfallJson['object'] == 'error':
-			raise Exception(self.scryfallJson['details'])
-			self.session.close()
-
-		self.session.close()
-
-	def object(self):
-		return self.scryfallJson['object']
-
-	def id(self):
-		return self.scryfallJson['id']
-
-	def multiverse_ids(self):
-		return self.scryfallJson['multiverse_ids']
-
-	def mtgo_id(self):
-		return self.scryfallJson['mtgo_id']
-
-	def mtgo_foil_id(self):
-		return self.scryfallJson['mtgo_foil_id']
-
-	def name(self):
-		return self.scryfallJson['name']
-
-	def uri(self):
-		return self.scryfallJson['uri']
-
-	def scryfall_uri(self):
-		return self.scryfallJson['scryfall_uri']
-
-	def layout(self):
-		return self.scryfallJson['layout']
-
-	def highres_image(self):
-		return self.scryfallJson['highres_image']
-
-	def image_uris(self):
-		return self.scryfallJson['image_uris']
-
-	def cmc(self):
-		return self.scryfallJson['cmc']
-
-	def type_line(self):
-		return self.scryfallJson['type_line']
-
-	def oracle_text(self):
-		return self.scryfallJson['oracle_text']
-
-	def mana_cost(self):
-		return self.scryfallJson['mana_cost']
-
-	def colors(self):
-		return self.scryfallJson['colors']
-
-	def color_identity(self):
-		return self.scryfallJson['color_identity']
-
-	def legalities(self):
-		return self.scryfallJson['legalities']
-
-	def reserved(self):
-		return self.scryfallJson['reserved']
-
-	def reprint(self):
-		return self.scryfallJson['reprint']
-
-	def set(self):
-		return self.scryfallJson['set']
-
-	def set_name(self):
-		return self.scryfallJson['set_name']
-
-	def set_uri(self):
-		return self.scryfallJson['set_uri']
-
-	def set_search_uri(self):
-		return self.scryfallJson['set_search_uri']
-
-	def scryfall_set_uri(self):
-		return self.scryfallJson['scryfall_set_uri']
-
-	def rulings_uri(self):
-		return self.scryfallJson['rulings_uri']
-
-	def prints_search_uri(self):
-		return self.scryfallJson['prints_search_uri']
-
-	def collector_number(self):
-		return self.scryfallJson['collector_number']
-
-	def digital(self):
-		return self.scryfallJson['digital']
-
-	def rarity(self):
-		return self.scryfallJson['rarity']
-
-	def illustration_id(self):
-		return self.scryfallJson['illustration_id']
-
-	def artist(self):
-		return self.scryfallJson['artist']
-
-	def frame(self):
-		return self.scryfallJson['frame']
-
-	def full_art(self):
-		return self.scryfallJson['full_art']
-
-	def border_color(self):
-		return self.scryfallJson['border_color']
-
-	def timeshifted(self):
-		return self.scryfallJson['timeshifted']
-
-	def colorshifted(self):
-		return self.scryfallJson['colorshifted']
-
-	def futureshifted(self):
-		return self.scryfallJson['futureshifted']
-
-	def edhrec_rank(self):
-		return self.scryfallJson['edhrec_rank']
-
-	def tix(self):
-		return self.scryfallJson['tix']
-
-	def related_uris(self):
-		return self.scryfallJson['related_uris']
-
-	def purchase_uris(self):
-		return self.scryfallJson['purchase_uris']
+	def __init__(self, **kwargs):
+		self.mtgoid = kwargs.get('id')
+		self.url = 'cards/mtgo/' + str(self.mtgoid)
+		super(Mtgo, self).__init__(self.url)

From baa3db3b55d3f137ee71b45c8b53d551f424d2f6 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Mon, 29 Jan 2018 23:43:36 -0500
Subject: [PATCH 08/13] Added key checking to each attribute in
 scryfall_object. Fixed import issues, can now import everything.

---
 cards/cardid.py          |   2 +-
 cards/collector.py       |   2 +-
 cards/mtgo.py            |   2 +-
 cards/multiverse.py      |   2 +-
 cards/named.py           |   2 +-
 cards/randomcard.py      |   2 +-
 cards/scryfall_object.py | 142 ++++++++++++++++++++++++++++++++++++++-
 7 files changed, 146 insertions(+), 8 deletions(-)

diff --git a/cards/cardid.py b/cards/cardid.py
index 73c098d..65d4a0b 100644
--- a/cards/cardid.py
+++ b/cards/cardid.py
@@ -1,4 +1,4 @@
-from scryfall_object import ScryfallObject
+from .scryfall_object import ScryfallObject
 
 class Id(ScryfallObject):
 	""" cards/:id
diff --git a/cards/collector.py b/cards/collector.py
index 776d50b..8fc2bf3 100644
--- a/cards/collector.py
+++ b/cards/collector.py
@@ -1,4 +1,4 @@
-from scryfall_object import ScryfallObject
+from .scryfall_object import ScryfallObject
 
 class Collector(ScryfallObject):
 	""" cards/:code/:collector_number
diff --git a/cards/mtgo.py b/cards/mtgo.py
index ee4aadb..ef267ed 100644
--- a/cards/mtgo.py
+++ b/cards/mtgo.py
@@ -1,4 +1,4 @@
-from scryfall_object import ScryfallObject
+from .scryfall_object import ScryfallObject
 import urllib.parse
 
 class Mtgo(ScryfallObject):
diff --git a/cards/multiverse.py b/cards/multiverse.py
index 88e7ccc..28734ab 100644
--- a/cards/multiverse.py
+++ b/cards/multiverse.py
@@ -1,4 +1,4 @@
-from scryfall_object import ScryfallObject
+from .scryfall_object import ScryfallObject
 
 class Multiverse(ScryfallObject):
 	"""
diff --git a/cards/named.py b/cards/named.py
index 9df3d8a..7d9553f 100644
--- a/cards/named.py
+++ b/cards/named.py
@@ -1,4 +1,4 @@
-from scryfall_object import ScryfallObject
+from .scryfall_object import ScryfallObject
 import urllib.parse
 
 class Named(ScryfallObject):
diff --git a/cards/randomcard.py b/cards/randomcard.py
index 68737e9..0bdc1ce 100644
--- a/cards/randomcard.py
+++ b/cards/randomcard.py
@@ -1,4 +1,4 @@
-from scryfall_object import ScryfallObject
+from .scryfall_object import ScryfallObject
 
 
 class RandomCard(ScryfallObject):
diff --git a/cards/scryfall_object.py b/cards/scryfall_object.py
index 45db750..babe523 100644
--- a/cards/scryfall_object.py
+++ b/cards/scryfall_object.py
@@ -1,7 +1,6 @@
 import aiohttp
 import asyncio
 
-
 class ScryfallObject(object):
 	"""
 	Parameters:
@@ -81,131 +80,270 @@ class ScryfallObject(object):
 
 		self.session.close()
 
+	def __checkForKey(self, key):
+		try:
+			return self.scryfallJson[key]
+		except KeyError:
+			return None
+
 	def object(self):
+		if self.__checkForKey('object') is None:
+			return KeyError("This card has no associated object.")
+
 		return self.scryfallJson['object']
 
 	def id(self):
+		if self.__checkForKey('id') is None:
+			return KeyError("This card has no associated id.")
+
 		return self.scryfallJson['id']
 
 	def multiverse_ids(self):
+		if self.__checkForKey('multiverse_ids') is None:
+			return KeyError("This card has no associated multiverse id.")
+
 		return self.scryfallJson['multiverse_ids']
 
 	def mtgo_id(self):
+		if self.__checkForKey('mtgo_id') is None:
+			return KeyError("This card has no associated mtgo id.")
+
 		return self.scryfallJson['mtgo_id']
 
 	def mtgo_foil_id(self):
+		if self.__checkForKey('mtgo_foil_id') is None:
+			return KeyError("This card has no associate mtgo foil id.")
+
 		return self.scryfallJson['mtgo_foil_id']
 
 	def name(self):
+		if self.__checkForKey('name') is None:
+			return KeyError("This card has no associated name.")
+
 		return self.scryfallJson['name']
 
 	def uri(self):
+		if self.__checkForKey('uri') is None:
+			return KeyError("This card has no associated uri.")
+
 		return self.scryfallJson['uri']
 
 	def scryfall_uri(self):
+		if self.__checkForKey('scryfall_uri') is None:
+			return KeyError("This card has no associated scryfall uri.")
+
 		return self.scryfallJson['scryfall_uri']
 
 	def layout(self):
+		if self.__checkForKey('layout') is None:
+			return KeyError("This card has no associated layout.")
+
 		return self.scryfallJson['layout']
 
 	def highres_image(self):
+		if self.__checkForKey('highres_image') is None:
+			return KeyError("This card has no associated highres image.")
+
 		return self.scryfallJson['highres_image']
 
 	def image_uris(self):
+		if self.__checkForKey('image_uris') is None:
+			return KeyError("This card has no associated image uris.")
+
 		return self.scryfallJson['image_uris']
 
 	def cmc(self):
+		if self.__checkForKey('cmc') is None:
+			return KeyError("This card has no associated cmc.")
+
 		return self.scryfallJson['cmc']
 
 	def type_line(self):
+		if self.__checkForKey('type_line') is None:
+			return KeyError("This card has no associated type line.")
+
 		return self.scryfallJson['type_line']
 
 	def oracle_text(self):
+		if self.__checkForKey('oracle_text') is None:
+			return KeyError("This card has no associated oracle text.")
+
 		return self.scryfallJson['oracle_text']
 
 	def mana_cost(self):
+		if self.__checkForKey('mana_cost') is None:
+			return KeyError("This card has no associated mana cost.")
+
 		return self.scryfallJson['mana_cost']
 
 	def colors(self):
+		if self.__checkForKey('colors') is None:
+			return KeyError("This card has no associated colors.")
+
 		return self.scryfallJson['colors']
 
 	def color_identity(self):
+		if self.__checkForKey('color_identity') is None:
+			return KeyError("This card has no associated color identity.")
+
 		return self.scryfallJson['color_identity']
 
 	def legalities(self):
+		if self.__checkForKey('legalities') is None:
+			return KeyError("This card has no associated legalities.")
+
 		return self.scryfallJson['legalities']
 
+	#TODO: Format error
 	def reserved(self):
+		if self.__checkForKey('reserved') is None:
+			return KeyError("This card has no associated .")
+
 		return self.scryfallJson['reserved']
 
 	def reprint(self):
+		if self.__checkForKey('reprint') is None:
+			return KeyError("This card has no associated reprint.")
+
 		return self.scryfallJson['reprint']
 
 	def set(self):
+		if self.__checkForKey('set') is None:
+			return KeyError("This card has no associated set.")
+
 		return self.scryfallJson['set']
 
 	def set_name(self):
+		if self.__checkForKey('set_name') is None:
+			return KeyError("This card has no associated set name.")
+
 		return self.scryfallJson['set_name']
 
 	def set_uri(self):
+		if self.__checkForKey('set_uri') is None:
+			return KeyError("This card has no associated set uri.")
+
 		return self.scryfallJson['set_uri']
 
 	def set_search_uri(self):
+		if self.__checkForKey('set_search_uri') is None:
+			return KeyError("This card has no associated set search uri.")
+
 		return self.scryfallJson['set_search_uri']
 
 	def scryfall_set_uri(self):
+		if self.__checkForKey('scryfall_set_uri') is None:
+			return KeyError("This card has no associated scryfall set uri.")
+
 		return self.scryfallJson['scryfall_set_uri']
 
 	def rulings_uri(self):
+		if self.__checkForKey('rulings_uri') is None:
+			return KeyError("This card has no associated rulings uri.")
+
 		return self.scryfallJson['rulings_uri']
 
 	def prints_search_uri(self):
+		if self.__checkForKey('prints_search_uri') is None:
+			return KeyError("This card has no associated prints search uri.")
+
 		return self.scryfallJson['prints_search_uri']
 
 	def collector_number(self):
+		if self.__checkForKey('collector_number') is None:
+			return KeyError("This card has no associated collector number.")
+
 		return self.scryfallJson['collector_number']
 
+	#TODO: Format Error
 	def digital(self):
+		if self.__checkForKey('digital') is None:
+			return KeyError("This card has no associated .")
+
 		return self.scryfallJson['digital']
 
 	def rarity(self):
+		if self.__checkForKey('rarity') is None:
+			return KeyError("This card has no associated rarity.")
+
 		return self.scryfallJson['rarity']
 
 	def illustration_id(self):
+		if self.__checkForKey('illustration_id') is None:
+			return KeyError("This card has no associated illustration id.")
+
 		return self.scryfallJson['illustration_id']
 
 	def artist(self):
+		if self.__checkForKey('artist') is None:
+			return KeyError("This card has no associated artist.")
+
 		return self.scryfallJson['artist']
 
 	def frame(self):
+		if self.__checkForKey('frame') is None:
+			return KeyError("This card has no associated frame.")
+
 		return self.scryfallJson['frame']
 
+	#TODO: Format error
 	def full_art(self):
+		if self.__checkForKey('') is None:
+			return KeyError("This card has no associated .")
+
 		return self.scryfallJson['full_art']
 
 	def border_color(self):
+		if self.__checkForKey('border_color') is None:
+			return KeyError("This card has no associated border color.")
+
 		return self.scryfallJson['border_color']
 
+	#TODO: Format Error
 	def timeshifted(self):
+		if self.__checkForKey('timeshifted') is None:
+			return KeyError("This card has no associated .")
+
 		return self.scryfallJson['timeshifted']
 
+	#TODO: Format Error
 	def colorshifted(self):
+		if self.__checkForKey('colorshifted') is None:
+			return KeyError("This card has no associated .")
+
 		return self.scryfallJson['colorshifted']
 
+	#TODO: Format Error
 	def futureshifted(self):
+		if self.__checkForKey('futureshifted') is None:
+			return KeyError("This card has no associated .")
+
 		return self.scryfallJson['futureshifted']
 
 	def edhrec_rank(self):
+		if self.__checkForKey('edhrec_rank') is None:
+			return KeyError("This card has no associated edhrec rank.")
+
 		return self.scryfallJson['edhrec_rank']
 
 	def currency(self, mode):
 		modes = ['usd', 'eur', 'tix']
 		if mode not in modes:
-			return KeyError("That currency is not available.")
+			return KeyError("This card has no associated currency {}".format(mode))
+
+		if self.__checkForKey(mode) is None:
+			return KeyError("This card has no associated currency {}".format(mode))
+
 		return self.scryfallJson[mode]
 
 	def related_uris(self):
+		if self.__checkForKey('related_uris') is None:
+			return KeyError("This card has no associated related uris.")
+
 		return self.scryfallJson['related_uris']
 
 	def purchase_uris(self):
+		if self.__checkForKey('purchase_uris') is None:
+			return KeyError("This card has no associated purchase uris.")
+
 		return self.scryfallJson['purchase_uris']

From 4e18a7e49967578c380fd26ffe779d4ec284589e Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Tue, 30 Jan 2018 09:56:26 -0500
Subject: [PATCH 09/13] Added more concise error codes.

---
 cards/scryfall_object.py | 94 +++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 50 deletions(-)

diff --git a/cards/scryfall_object.py b/cards/scryfall_object.py
index babe523..52c7dcf 100644
--- a/cards/scryfall_object.py
+++ b/cards/scryfall_object.py
@@ -39,7 +39,7 @@ class ScryfallObject(object):
 		set_search_uri: str		Same output as set_uri.
 		scryfall_set_uri: str	The full link to the set on Scryfall.
 		rulings_uri: str		The API uri for the rulings of the card.
-		prints_search_uri: str	TODO: Figure out what this does.
+		prints_search_uri: str	A link to where you can begin paginating all re/prints for this card on Scryfall’s API.
 		collector_number: str	The collector number of the card.
 		digital: bool			Returns True if the card is the digital version.
 		rarity: str				The rarity of the card.
@@ -88,262 +88,256 @@ class ScryfallObject(object):
 
 	def object(self):
 		if self.__checkForKey('object') is None:
-			return KeyError("This card has no associated object.")
+			return KeyError("This card has no associated object key.")
 
 		return self.scryfallJson['object']
 
 	def id(self):
 		if self.__checkForKey('id') is None:
-			return KeyError("This card has no associated id.")
+			return KeyError("This card has no associated id key.")
 
 		return self.scryfallJson['id']
 
 	def multiverse_ids(self):
 		if self.__checkForKey('multiverse_ids') is None:
-			return KeyError("This card has no associated multiverse id.")
+			return KeyError("This card has no associated multiverse id key.")
 
 		return self.scryfallJson['multiverse_ids']
 
 	def mtgo_id(self):
 		if self.__checkForKey('mtgo_id') is None:
-			return KeyError("This card has no associated mtgo id.")
+			return KeyError("This card has no associated mtgo id key.")
 
 		return self.scryfallJson['mtgo_id']
 
 	def mtgo_foil_id(self):
 		if self.__checkForKey('mtgo_foil_id') is None:
-			return KeyError("This card has no associate mtgo foil id.")
+			return KeyError("This card has no associate mtgo foil id key.")
 
 		return self.scryfallJson['mtgo_foil_id']
 
 	def name(self):
 		if self.__checkForKey('name') is None:
-			return KeyError("This card has no associated name.")
+			return KeyError("This card has no associated name key.")
 
 		return self.scryfallJson['name']
 
 	def uri(self):
 		if self.__checkForKey('uri') is None:
-			return KeyError("This card has no associated uri.")
+			return KeyError("This card has no associated uri key.")
 
 		return self.scryfallJson['uri']
 
 	def scryfall_uri(self):
 		if self.__checkForKey('scryfall_uri') is None:
-			return KeyError("This card has no associated scryfall uri.")
+			return KeyError("This card has no associated scryfall uri key.")
 
 		return self.scryfallJson['scryfall_uri']
 
 	def layout(self):
 		if self.__checkForKey('layout') is None:
-			return KeyError("This card has no associated layout.")
+			return KeyError("This card has no associated layout key.")
 
 		return self.scryfallJson['layout']
 
 	def highres_image(self):
 		if self.__checkForKey('highres_image') is None:
-			return KeyError("This card has no associated highres image.")
+			return KeyError("This card has no associated highres image key.")
 
 		return self.scryfallJson['highres_image']
 
 	def image_uris(self):
 		if self.__checkForKey('image_uris') is None:
-			return KeyError("This card has no associated image uris.")
+			return KeyError("This card has no associated image uris key.")
 
 		return self.scryfallJson['image_uris']
 
 	def cmc(self):
 		if self.__checkForKey('cmc') is None:
-			return KeyError("This card has no associated cmc.")
+			return KeyError("This card has no associated cmc key.")
 
 		return self.scryfallJson['cmc']
 
 	def type_line(self):
 		if self.__checkForKey('type_line') is None:
-			return KeyError("This card has no associated type line.")
+			return KeyError("This card has no associated type line key.")
 
 		return self.scryfallJson['type_line']
 
 	def oracle_text(self):
 		if self.__checkForKey('oracle_text') is None:
-			return KeyError("This card has no associated oracle text.")
+			return KeyError("This card has no associated oracle text key.")
 
 		return self.scryfallJson['oracle_text']
 
 	def mana_cost(self):
 		if self.__checkForKey('mana_cost') is None:
-			return KeyError("This card has no associated mana cost.")
+			return KeyError("This card has no associated mana cost key.")
 
 		return self.scryfallJson['mana_cost']
 
 	def colors(self):
 		if self.__checkForKey('colors') is None:
-			return KeyError("This card has no associated colors.")
+			return KeyError("This card has no associated colors key.")
 
 		return self.scryfallJson['colors']
 
 	def color_identity(self):
 		if self.__checkForKey('color_identity') is None:
-			return KeyError("This card has no associated color identity.")
+			return KeyError("This card has no associated color identity key.")
 
 		return self.scryfallJson['color_identity']
 
 	def legalities(self):
 		if self.__checkForKey('legalities') is None:
-			return KeyError("This card has no associated legalities.")
+			return KeyError("This card has no associated legalities key.")
 
 		return self.scryfallJson['legalities']
 
-	#TODO: Format error
 	def reserved(self):
 		if self.__checkForKey('reserved') is None:
-			return KeyError("This card has no associated .")
+			return KeyError("This card has no associated  reserved key key.")
 
 		return self.scryfallJson['reserved']
 
 	def reprint(self):
 		if self.__checkForKey('reprint') is None:
-			return KeyError("This card has no associated reprint.")
+			return KeyError("This card has no associated reprint key.")
 
 		return self.scryfallJson['reprint']
 
 	def set(self):
 		if self.__checkForKey('set') is None:
-			return KeyError("This card has no associated set.")
+			return KeyError("This card has no associated set key.")
 
 		return self.scryfallJson['set']
 
 	def set_name(self):
 		if self.__checkForKey('set_name') is None:
-			return KeyError("This card has no associated set name.")
+			return KeyError("This card has no associated set name key.")
 
 		return self.scryfallJson['set_name']
 
 	def set_uri(self):
 		if self.__checkForKey('set_uri') is None:
-			return KeyError("This card has no associated set uri.")
+			return KeyError("This card has no associated set uri key.")
 
 		return self.scryfallJson['set_uri']
 
 	def set_search_uri(self):
 		if self.__checkForKey('set_search_uri') is None:
-			return KeyError("This card has no associated set search uri.")
+			return KeyError("This card has no associated set search uri key.")
 
 		return self.scryfallJson['set_search_uri']
 
 	def scryfall_set_uri(self):
 		if self.__checkForKey('scryfall_set_uri') is None:
-			return KeyError("This card has no associated scryfall set uri.")
+			return KeyError("This card has no associated scryfall set uri key.")
 
 		return self.scryfallJson['scryfall_set_uri']
 
 	def rulings_uri(self):
 		if self.__checkForKey('rulings_uri') is None:
-			return KeyError("This card has no associated rulings uri.")
+			return KeyError("This card has no associated rulings uri key.")
 
 		return self.scryfallJson['rulings_uri']
 
 	def prints_search_uri(self):
 		if self.__checkForKey('prints_search_uri') is None:
-			return KeyError("This card has no associated prints search uri.")
+			return KeyError("This card has no associated prints search uri key.")
 
 		return self.scryfallJson['prints_search_uri']
 
 	def collector_number(self):
 		if self.__checkForKey('collector_number') is None:
-			return KeyError("This card has no associated collector number.")
+			return KeyError("This card has no associated collector number key.")
 
 		return self.scryfallJson['collector_number']
 
-	#TODO: Format Error
 	def digital(self):
 		if self.__checkForKey('digital') is None:
-			return KeyError("This card has no associated .")
+			return KeyError("This card has no associated digital key key.")
 
 		return self.scryfallJson['digital']
 
 	def rarity(self):
 		if self.__checkForKey('rarity') is None:
-			return KeyError("This card has no associated rarity.")
+			return KeyError("This card has no associated rarity key.")
 
 		return self.scryfallJson['rarity']
 
 	def illustration_id(self):
 		if self.__checkForKey('illustration_id') is None:
-			return KeyError("This card has no associated illustration id.")
+			return KeyError("This card has no associated illustration id key.")
 
 		return self.scryfallJson['illustration_id']
 
 	def artist(self):
 		if self.__checkForKey('artist') is None:
-			return KeyError("This card has no associated artist.")
+			return KeyError("This card has no associated artist key.")
 
 		return self.scryfallJson['artist']
 
 	def frame(self):
 		if self.__checkForKey('frame') is None:
-			return KeyError("This card has no associated frame.")
+			return KeyError("This card has no associated frame key.")
 
 		return self.scryfallJson['frame']
 
-	#TODO: Format error
 	def full_art(self):
 		if self.__checkForKey('') is None:
-			return KeyError("This card has no associated .")
+			return KeyError("This card has no associated full art key key.")
 
 		return self.scryfallJson['full_art']
 
 	def border_color(self):
 		if self.__checkForKey('border_color') is None:
-			return KeyError("This card has no associated border color.")
+			return KeyError("This card has no associated border color key.")
 
 		return self.scryfallJson['border_color']
 
-	#TODO: Format Error
 	def timeshifted(self):
 		if self.__checkForKey('timeshifted') is None:
-			return KeyError("This card has no associated .")
+			return KeyError("This card has no associated timeshifted key key.")
 
 		return self.scryfallJson['timeshifted']
 
-	#TODO: Format Error
 	def colorshifted(self):
 		if self.__checkForKey('colorshifted') is None:
-			return KeyError("This card has no associated .")
+			return KeyError("This card has no associated colorshifted key key.")
 
 		return self.scryfallJson['colorshifted']
 
-	#TODO: Format Error
 	def futureshifted(self):
 		if self.__checkForKey('futureshifted') is None:
-			return KeyError("This card has no associated .")
+			return KeyError("This card has no associated futureshifted key key.")
 
 		return self.scryfallJson['futureshifted']
 
 	def edhrec_rank(self):
 		if self.__checkForKey('edhrec_rank') is None:
-			return KeyError("This card has no associated edhrec rank.")
+			return KeyError("This card has no associated edhrec rank key.")
 
 		return self.scryfallJson['edhrec_rank']
 
 	def currency(self, mode):
 		modes = ['usd', 'eur', 'tix']
 		if mode not in modes:
-			return KeyError("This card has no associated currency {}".format(mode))
+			return KeyError("{} is not a key.".format(mode))
 
 		if self.__checkForKey(mode) is None:
-			return KeyError("This card has no associated currency {}".format(mode))
+			return KeyError("This card has no associated currency {} key".format(mode))
 
 		return self.scryfallJson[mode]
 
 	def related_uris(self):
 		if self.__checkForKey('related_uris') is None:
-			return KeyError("This card has no associated related uris.")
+			return KeyError("This card has no associated related uris key.")
 
 		return self.scryfallJson['related_uris']
 
 	def purchase_uris(self):
 		if self.__checkForKey('purchase_uris') is None:
-			return KeyError("This card has no associated purchase uris.")
+			return KeyError("This card has no associated purchase uris key.")
 
 		return self.scryfallJson['purchase_uris']

From 4c53f33470809ff9d35fe19e2c051f468f013952 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Tue, 30 Jan 2018 10:18:47 -0500
Subject: [PATCH 10/13] Added more missed keys from scryfall. Created
 cards_unit_test.

---
 cards/scryfall_object.py | 48 ++++++++++++++++++++++++++++++++++++++++
 tests/cards_unit_test.py |  7 ++++++
 2 files changed, 55 insertions(+)
 create mode 100644 tests/cards_unit_test.py

diff --git a/cards/scryfall_object.py b/cards/scryfall_object.py
index 52c7dcf..7148c42 100644
--- a/cards/scryfall_object.py
+++ b/cards/scryfall_object.py
@@ -341,3 +341,51 @@ class ScryfallObject(object):
 			return KeyError("This card has no associated purchase uris key.")
 
 		return self.scryfallJson['purchase_uris']
+
+	def life_modifier(self):
+		if self.__checkForKey('life_modifier') is None:
+			return KeyError("This card has no associated life modifier key.")
+
+		return self.scryfallJson['life_modifier']
+
+	def hand_modifier(self):
+		if self.__checkForKey('hand_modifier') is None:
+			return KeyError("This card has no associated hand modifier key.")
+
+		return self.scryfallJson['hand_modifier']
+
+	def color_indicator(self):
+		if self.__checkForKey('color_indicator') is None:
+			return KeyError("This card has no associated color indicator key.")
+
+		return self.scryfallJson['color_indicator']
+
+	def all_parts(self):
+		if self.__checkForKey('all_parts') is None:
+			return KeyError("This card has no associated all parts key.")
+
+		return self.scryfallJson['all_parts']
+
+	def card_faces(self):
+		if self.__checkForKey('card_faces') is None:
+			return KeyError("This card has no associated card faces key.")
+
+		return self.scryfallJson['card_faces']
+
+	def watermark(self):
+		if self.__checkForKey('watermark') is None:
+			return KeyError("This card has no associated watermark key.")
+
+		return self.scryfallJson['watermark']
+
+	def story_spotlight_number(self):
+		if self.__checkForKey('story_spotlight_number') is None:
+			return KeyError("This card has no associated story spotlight number key.")
+
+		return self.scryfallJson['story_spotlight_number']
+
+	def story_spotlight_uri(self):
+		if self.__checkForKey('story_spotlight_uri') is None:
+			return KeyError("This card has no associated story spotlight uri key.")
+
+		return self.scryfallJson['story_spotlight_uri']
diff --git a/tests/cards_unit_test.py b/tests/cards_unit_test.py
new file mode 100644
index 0000000..94fef8a
--- /dev/null
+++ b/tests/cards_unit_test.py
@@ -0,0 +1,7 @@
+import unittest
+import cards
+
+class TestObjectCreation(unittest.TestCase):
+
+    def testRandomCard(self):
+        pass

From 7ab602cec7a05718576de49d51ca740bec1c91d4 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Tue, 30 Jan 2018 10:30:14 -0500
Subject: [PATCH 11/13] Updated autocomplete to be more consistent with the
 rest of cards.

---
 cards/autocomplete.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/cards/autocomplete.py b/cards/autocomplete.py
index ecddac2..40a8acf 100644
--- a/cards/autocomplete.py
+++ b/cards/autocomplete.py
@@ -1,5 +1,4 @@
 import asyncio, aiohttp
-import json
 
 class Autocomplete(object):
 	""" cards/autocomplete
@@ -32,16 +31,31 @@ class Autocomplete(object):
 			params={'q':self.query, 'pretty':self.pretty, 'format':self.format}))
 
 		if self.scryfallJson['object'] == 'error':
-			raise Exception(self.scryfallJson['details'])
 			self.session.close()
+			raise Exception(self.scryfallJson['details'])
 
 		self.session.close()
 
+	def __checkForKey(self, key):
+		try:
+			return self.scryfallJson[key]
+		except KeyError:
+			return None
+
 	def object(self):
+		if self.__checkForKey('object') is None:
+			return KeyError('This card has no associated object key.')
+
 		return self.scryfallJson['object']
 
 	def total_items(self):
+		if self.__checkForKey('total_items') is None:
+			return KeyError('This card has no associated total items key.')
+
 		return self.scryfallJson['total_items']
 
 	def data(self):
+		if self.__checkForKey('data') is None:
+			return KeyError('This card has no associated data key.')
+
 		return self.scryfallJson['data']

From 958cdaae89a0821fef48f69d19a54a5205dd7348 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Tue, 30 Jan 2018 19:32:39 -0500
Subject: [PATCH 12/13] Renamed RandomCard to Random for ease of use. Also some
 stuff to autocomplete.

---
 cards/__init__.py     | 2 +-
 cards/autocomplete.py | 6 +++---
 cards/randomcard.py   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cards/__init__.py b/cards/__init__.py
index 08911e0..f0f191d 100644
--- a/cards/__init__.py
+++ b/cards/__init__.py
@@ -4,4 +4,4 @@ from .cardid import Id
 from .mtgo import Mtgo
 from .multiverse import Multiverse
 from .named import Named
-from .randomcard import RandomCard
+from .randomcard import Random
diff --git a/cards/autocomplete.py b/cards/autocomplete.py
index 40a8acf..99517b7 100644
--- a/cards/autocomplete.py
+++ b/cards/autocomplete.py
@@ -15,10 +15,10 @@ class Autocomplete(object):
 
 	"""
 
-	def __init__(self, query, pretty=None, _format=None):
+	def __init__(self, query, **kwargs):
 		self.query = query
-		self.pretty = pretty
-		self.format = _format
+		self.pretty = kwargs.get('pretty')
+		self.format = kwargs.get('format')
 		loop = asyncio.get_event_loop()
 		self.session = aiohttp.ClientSession(loop=loop)
 
diff --git a/cards/randomcard.py b/cards/randomcard.py
index 0bdc1ce..ac16cba 100644
--- a/cards/randomcard.py
+++ b/cards/randomcard.py
@@ -1,8 +1,8 @@
 from .scryfall_object import ScryfallObject
 
 
-class RandomCard(ScryfallObject):
+class Random(ScryfallObject):
     """This will return a random card. No parameters are passed while creating."""
     def __init__(self):
         self.url = 'cards/random'
-        super(RandomCard, self).__init__(self.url)
+        super(Random, self).__init__(self.url)

From 4441bc14d5927e934061a937d666e266ac63afb6 Mon Sep 17 00:00:00 2001
From: Nanda Scott <nanda1123@gmail.com>
Date: Tue, 30 Jan 2018 19:34:07 -0500
Subject: [PATCH 13/13] Removed .idea folder.

---
 .idea/dictionaries/nanda.xml                 |  15 --
 .idea/inspectionProfiles/Project_Default.xml |  21 --
 .idea/misc.xml                               |   4 -
 .idea/modules.xml                            |   8 -
 .idea/scrython.iml                           |  11 -
 .idea/vcs.xml                                |   6 -
 .idea/workspace.xml                          | 235 -------------------
 7 files changed, 300 deletions(-)
 delete mode 100644 .idea/dictionaries/nanda.xml
 delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 .idea/misc.xml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/scrython.iml
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 .idea/workspace.xml

diff --git a/.idea/dictionaries/nanda.xml b/.idea/dictionaries/nanda.xml
deleted file mode 100644
index a902a65..0000000
--- a/.idea/dictionaries/nanda.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<component name="ProjectDictionaryState">
-  <dictionary name="nanda">
-    <words>
-      <w>colorshifted</w>
-      <w>edhrec</w>
-      <w>futureshifted</w>
-      <w>highres</w>
-      <w>mana</w>
-      <w>mtgo</w>
-      <w>multiverse</w>
-      <w>scryfall</w>
-      <w>timeshifted</w>
-    </words>
-  </dictionary>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index d34c0a8..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="W191" />
-          <option value="E101" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="N802" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyUnreachableCodeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 65531ca..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 7535cb7..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/scrython.iml" filepath="$PROJECT_DIR$/.idea/scrython.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/scrython.iml b/.idea/scrython.iml
deleted file mode 100644
index 6711606..0000000
--- a/.idea/scrython.iml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index ab9295e..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="90008d80-8a8d-4e49-ac3c-faac0ecb9624" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/cards/named.py" afterPath="$PROJECT_DIR$/cards/named.py" />
-      <change beforePath="$PROJECT_DIR$/cards/randomcard.py" afterPath="$PROJECT_DIR$/cards/randomcard.py" />
-      <change beforePath="$PROJECT_DIR$/requirements.txt" afterPath="$PROJECT_DIR$/requirements.txt" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="TRACKING_ENABLED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="scryfall_object.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/cards/scryfall_object.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
-              <caret line="16" column="44" lean-forward="false" selection-start-line="16" selection-start-column="44" selection-end-line="16" selection-end-column="44" />
-              <folding>
-                <element signature="e#0#14#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="randomcard.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cards/randomcard.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1332">
-              <caret line="74" column="9" lean-forward="true" selection-start-line="74" selection-start-column="9" selection-end-line="74" selection-end-column="9" />
-              <folding>
-                <element signature="e#0#14#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="multiverse.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/cards/multiverse.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-              <folding>
-                <element signature="e#0#23#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/cards/randomcard.py" />
-        <option value="$PROJECT_DIR$/cards/scryfall_object.py" />
-        <option value="$PROJECT_DIR$/cards/named.py" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="width" value="1366" />
-    <option name="height" value="743" />
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Python</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>PyPep8Inspection</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="1" id="Add" />
-  </component>
-  <component name="ProjectView">
-    <navigator currentView="ProjectPane" proportions="" version="1">
-      <flattenPackages />
-      <showMembers />
-      <showModules />
-      <showLibraryContents />
-      <hideEmptyPackages />
-      <abbreviatePackageNames />
-      <autoscrollToSource />
-      <autoscrollFromSource />
-      <sortByType />
-      <manualOrder />
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="Scope" />
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="scrython" type="b2602c69:ProjectViewProjectNode" />
-              <item name="scrython" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="scrython" type="b2602c69:ProjectViewProjectNode" />
-              <item name="scrython" type="462c0819:PsiDirectoryNode" />
-              <item name="cards" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scratches" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="preferences.keymap" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false">
-    <option name="remove_strategy" value="false" />
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="90008d80-8a8d-4e49-ac3c-faac0ecb9624" name="Default" comment="" />
-      <created>1516750438711</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1516750438711</updated>
-    </task>
-    <servers />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1366" height="743" extended-state="6" />
-    <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17349927" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-    </layout>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <option name="time" value="2" />
-    </breakpoint-manager>
-    <watches-manager />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/cards/named.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1494">
-          <caret line="83" column="12" lean-forward="true" selection-start-line="83" selection-start-column="12" selection-end-line="83" selection-end-column="12" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cards/multiverse.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="e#0#23#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cards/randomcard.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1332">
-          <caret line="74" column="9" lean-forward="true" selection-start-line="74" selection-start-column="9" selection-end-line="74" selection-end-column="9" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cards/scryfall_object.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="16" column="44" lean-forward="false" selection-start-line="16" selection-start-column="44" selection-end-line="16" selection-end-column="44" />
-          <folding>
-            <element signature="e#0#14#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file