First round of testing/fixing. This is getting somewhere!