put remaining forms into separate classes