Refactor everything to be more Actor-like...