Adding Metering

Adding Metering FIXME