Lots of work at work. Also rewriting the main window for v1.0 after some good advice.