Modifies types and attempts to add a test deck (but currently fails)

Author: ammesonb, dbtrue