Include params in template funcs
Rewrite all handlers, and other code relevant