Trying to improve start up times by moving more funcitonality into 'Prepare'
Authored by: doug_gillespie 2018-11-16
Parent: [r162]
Child: [r164]