clean up/better comments/some movingSensor stuff