Cleaned up Deck

took out stupid indexing things, made deck an attribute