some more progress on swap