WIP add activity management to Player