Re-Writing CFA Level 2 - Attempt #2