More work on bashing the messaging into shape
More work chasing the functions down