Initial Build with correct template