Some refactoring
Add noise data from wandering around Capitol Hill