added the basic stuff