Almost got the Events Table working. Not quite. But close.
Merge branch 'jeremy' into tom