Refactored for a single ActivityManager

$worked 4h on #8