Finished Ermit's forms. Work on #22