Minor cleanup
Basic version of locals working