Need to re-order initialization of application