Added basic framework