#[9] Refactored - still need to move to methods