Getting close to having things working again.