Refactoring...added VicsWagon and Accelerometer classes