Add a conditional for running app install
Move around object instantiation