add remove basics
reorganised