fancy refactoring (decouple everything ...) in preparation for friends/following and favorite relationships