Add a form  and move entries into new controller