Added some basic framework