add deletion to master, including delete hooks
add getId to base object
merge master