Sorted the base server. Slowly adapting for app