Update - the end is almost in sight!