Began adding logic for initial application start