Feature/nick async