Client rewrite, added delete and edit ability