Adding capabilities for decomposition...not working yet.