Added buffer replacement implementation.
Updated more inter types.
Commented out telemetric and timer references