Making good progress. Need to fix up the controls, though...