Started support for edit
Got save working