Added framework features

A storm is coming.