Started merging the template into the code. Hope this will end very soon