Initial Merge

Added Card definitions