WIP - start refactor of activities table into more star-like structure