Front end templates and minor backend code - #16