Moved basic template functions back
Added more samples
Added more templates