Latest LOCAL dev changes.

Signed-off-by: Dom Pascal <dom@dompascal.com>