added Locals class, even though I wish I didn't have to ;-)
fix locals