Big refactoring to include template engine