Added basic framework - non functional