Added initial framework