Started adding templating structure(WIP)