Move to seperate server