Added equation forms

Should make old equations system obsolete