Fixed a few things, first step in appending sub component template