prototype: Refactor TC and specifically problem handling considerably.