@anthony-tarantini [finishes #67482888] refactor activity classes.