wip
Added in configuration anslysis and more parameterizations