Added proximity code, SpotTags, position estimation