#20 Added edit (from modal) capability