More work

Sorry for these bad commits, I don't have time for better ones.