More work for templating and grid implementation. Also imported Handlebars