Added capital and labor tax decomposition

Signed-off-by: David Evans <dgevans42@gmail.com>