added some basic functionality