Partly addresses issue #17 and issue #18.
Still require a proper security check when deletion occurs.