Fasterled

Pulling focalintent's changes to test with mine.