Finally get things sort of working. Ugh.