This fixes #1 and also fixes #2

Add CGD form;
Update BPI and Santander forms.