Begin work on edit handler