Just about finished on layout changes. After that, should be smooth sailing.