Add/update/pull scent wheel functional
Merge conflicts
Merge conflicts
Fix merge conflicts