Work in progress, again.