added some basic framework stuff