Begin tidy of statement controller
More tidy up of statement controller
Split out Statement Controller and ViewModel