First start at moving app level code out of main server file