Started work on advanced edit features