Started adding velocity templates