Add realtime feedback (finish implementing for add and edit)
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch