Refactor application to be a mroe proper mountable Engine that can be properly tested