Some more muck work