switched back to using template loader
merge commit