Pushed changes to form_finder class and new data classes