last working commit before server stuff