Starting to strip out old code heavily to leave a focused core around
the new actor logic, will borrow back in any code needed.