added setup
restructured
added init
undelete?!