Started adding support for action editing