20130507 - Refactored, and logging at 100 Hz