Added framework

Signed-off-by: Conrad Bartels Daal <conrad@proxible.com>
Updated framework

Signed-off-by: Conrad Bartels Daal <conrad@proxible.com>