Started work on bug 1000174