Working on #392
Moved forms into classes