changed field messageTimestamp to timestamp
working on validation generics - not cmplt
Working branch commig .. non-compile
Compiled version
Simple renames. Tidy up