Starting to decouple

Just committing some progress. I’m just at the beginning of decoupling
the objects.