Re-Enable Tinker's Armory

Part of #46