[Issue #205][WIP] Finished edit story