Choose template to execute
New router implementation
Minor fixes
Better tests for router