More GUI re-writing, it's going fairly well.