Restarting project based off new SDK service structure