Implemented more of the punchcard maker, progress toward #3