commit 23-3 lots of changes

basic change..linked message ids