Merged ScaleUp App back into ScaleUp