Refactor and fix

Use the Teacup dummy class concept to make things work.