added some basic stuff...