Started work on edit tool, added highlighting