Added gravity forms and merged over from laptop