copied more code that will be needed later for server and deleted an unused test file