Complete s1c4, also rename Buffer -> Buff