Still need to add server check