generic forms added; user classes refactored
new entries ok