Refactored for use of CBVs (just getting to that section in 2 scoops), instead of FBVs