Got things sort of working again...