Added new fields for homework_forms
Some naming changes
Moved to outer public class
Stills needs to be finished