Working on measures module and settings issues