Added initial decomment stuff