Refactored, Bonus 1 complete