Using transcludeFn

Based on changes proposed on  #4 and also some additional separation of elements