did some work on Server but not nearly finished