Refactored Dopeler, working on refactoring Doppler