Added a proper server thing