wip.
More work. It's coming along.