merged with templaza/tz_portfolio