More work!

Updated logic of cascading deletes
Begin work on tests