Make CreateTimeStamp more generic
Add Expander style, test flags