Swapped out jade for templayed
merge