Done issue #38;
Merge some changes from Polyna;
Add template controller (empty impls)