First pass at new combined template