Modularized watch into own class