Last commit before changing measurement model
Looking reasonable!