added most basic stuff