Streamlined code and fixed a bug
Makes a whole deck