Should probably use transactions now