I didn't go the aspect-oriented programming route