Refactored, find and create working.  Delete needs updating.